From ab2187dbdfa048102dd6e38c73f35c518b90a526 Mon Sep 17 00:00:00 2001
From: iNPUTmice <daniel@gultsch.de>
Date: Mon, 15 Dec 2014 17:36:16 +0100
Subject: [PATCH] fixed crashing on unparsed jids

---
 .../java/eu/siacs/conversations/parser/MessageParser.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/parser/MessageParser.java b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
index cd4c6401a..e9d491b5f 100644
--- a/src/main/java/eu/siacs/conversations/parser/MessageParser.java
+++ b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
@@ -60,12 +60,12 @@ public class MessageParser extends AbstractParser implements
 	}
 
 	private Message parseOtrChat(MessagePacket packet, Account account) {
-		boolean properlyAddressed = (!packet.getTo().isBareJid())
-				|| (account.countPresences() == 1);
-        final Jid from = packet.getFrom();
-		if (from == null) {
+		final Jid to = packet.getTo();
+		final Jid from = packet.getFrom();
+		if (to == null || from == null) {
 			return null;
 		}
+		boolean properlyAddressed = !to.isBareJid() || account.countPresences() == 1;
 		Conversation conversation = mXmppConnectionService
 				.findOrCreateConversation(account, from.toBareJid(), false);
 		String presence;