diff --git a/smack-im/src/main/java/org/jivesoftware/smack/chat/ChatManager.java b/smack-im/src/main/java/org/jivesoftware/smack/chat/ChatManager.java
index 9351b233b..9d7f854e8 100644
--- a/smack-im/src/main/java/org/jivesoftware/smack/chat/ChatManager.java
+++ b/smack-im/src/main/java/org/jivesoftware/smack/chat/ChatManager.java
@@ -322,7 +322,10 @@ public final class ChatManager extends Manager{
         Chat match = jidChats.get(userJID);
 
         if (match == null && (matchMode == MatchMode.BARE_JID)) {
-            match = baseJidChats.get(userJID.asEntityBareJidIfPossible());
+            EntityBareJid entityBareJid = userJID.asEntityBareJidIfPossible();
+            if (entityBareJid != null) {
+                match = baseJidChats.get(entityBareJid);
+            }
         }
         return match;
     }