diff --git a/broker/src/main/java/org/eclipse/moquette/spi/impl/security/FileAuthenticator.java b/broker/src/main/java/org/eclipse/moquette/spi/impl/security/FileAuthenticator.java
index 6f3ede72..d2991a70 100644
--- a/broker/src/main/java/org/eclipse/moquette/spi/impl/security/FileAuthenticator.java
+++ b/broker/src/main/java/org/eclipse/moquette/spi/impl/security/FileAuthenticator.java
@@ -107,6 +107,10 @@ public class FileAuthenticator implements IAuthenticator {
     }
     
     public boolean checkValid(String username, String password) {
+        if (username == null || password == null) {
+            LOG.info("username or password was null");
+            return false;
+        }
         String foundPwq = m_identities.get(username);
         if (foundPwq == null) {
             return false;