diff --git a/src/eu/siacs/conversations/parser/MessageParser.java b/src/eu/siacs/conversations/parser/MessageParser.java
index d4e1e08d0..ac0978812 100644
--- a/src/eu/siacs/conversations/parser/MessageParser.java
+++ b/src/eu/siacs/conversations/parser/MessageParser.java
@@ -174,6 +174,9 @@ public class MessageParser extends AbstractParser implements
 		} else {
 			fullJid = message.getAttribute("to");
 		}
+		if (fullJid==null) {
+			return null;
+		}
 		String[] parts = fullJid.split("/");
 		Conversation conversation = mXmppConnectionService
 				.findOrCreateConversation(account, parts[0], false);