diff --git a/pluto-server/src/main/java/de/itvsh/ozg/pluto/common/callcontext/CurrentUserService.java b/pluto-server/src/main/java/de/itvsh/ozg/pluto/common/callcontext/CurrentUserService.java
index bc469f45b7accff0c263e66128e34afe52e97d5d..3d41892267fb84557179ee9236ae3266669a57fc 100644
--- a/pluto-server/src/main/java/de/itvsh/ozg/pluto/common/callcontext/CurrentUserService.java
+++ b/pluto-server/src/main/java/de/itvsh/ozg/pluto/common/callcontext/CurrentUserService.java
@@ -36,12 +36,13 @@ public class CurrentUserService {
 		}
 	}
 
-	public Optional<Authentication> getAuthentication() {
+	public Optional<Authentication> findAuthentication() {
 		return findTrustedAuthentication();
 	}
 
 	Optional<Authentication> findTrustedAuthentication() {
-		return Optional.ofNullable(SecurityContextHolder.getContext().getAuthentication())
+		return Optional.ofNullable(SecurityContextHolder.getContext())
+				.map(context -> context.getAuthentication())
 				.filter(auth -> !trustResolver.isAnonymous(auth))
 				.filter(Authentication::isAuthenticated);
 	}