diff --git a/lib/SP/Services/User/UserPassService.php b/lib/SP/Services/User/UserPassService.php
index b8b19539..d84e5a3e 100644
--- a/lib/SP/Services/User/UserPassService.php
+++ b/lib/SP/Services/User/UserPassService.php
@@ -107,6 +107,7 @@ final class UserPassService extends Service
         $configHashMPass = $this->configService->getByParam('masterPwd');
 
         if (empty($configHashMPass)
+            || $userLoginResponse === null
             || empty($userLoginResponse->getMPass())
             || empty($userLoginResponse->getMKey())
         ) {