diff --git a/lib/remote/httpserverconnection.cpp b/lib/remote/httpserverconnection.cpp
index 8962258e3..52fa5a703 100644
--- a/lib/remote/httpserverconnection.cpp
+++ b/lib/remote/httpserverconnection.cpp
@@ -162,7 +162,7 @@ void HttpServerConnection::ProcessMessageAsync(HttpRequest& request)
 			user.reset();
 		else {
 			Dictionary::Ptr passwordDict = user->GetPasswordDict();
-			if (!ComparePassword(passwordDict->Get("password"), password, passwordDict->Get("salt")))
+			if (!passwordDict || !ComparePassword(passwordDict->Get("password"), password, passwordDict->Get("salt")))
 				user.reset();
 		}
 	}