diff --git a/lib/CirclesManager.php b/lib/CirclesManager.php
index 6acbd69d2..541be5d36 100644
--- a/lib/CirclesManager.php
+++ b/lib/CirclesManager.php
@@ -248,9 +248,15 @@ public function stopSession(): void {
 
 	/**
 	 * @return IFederatedUser
+	 * @throws FederatedUserNotFoundException
 	 */
 	public function getCurrentFederatedUser(): IFederatedUser {
-		return $this->federatedUserService->getCurrentUser();
+		$current = $this->federatedUserService->getCurrentUser();
+		if (is_null($current)) {
+			throw new FederatedUserNotFoundException();
+		}
+
+		return $current;
 	}