From f6281a182df6e251a326538702bf4f3b6f80a62b Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Tue, 21 Jul 2015 19:44:25 +0200
Subject: [PATCH] fixed npe in error message handling

---
 src/main/java/eu/siacs/conversations/parser/MessageParser.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/eu/siacs/conversations/parser/MessageParser.java b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
index b81a62da6..c2fdf5b8a 100644
--- a/src/main/java/eu/siacs/conversations/parser/MessageParser.java
+++ b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
@@ -206,7 +206,7 @@ public class MessageParser extends AbstractParser implements
 						from.toBareJid(),
 						packet.getId(),
 						Message.STATUS_SEND_FAILED);
-				if (message.getEncryption() == Message.ENCRYPTION_OTR) {
+				if (message != null && message.getEncryption() == Message.ENCRYPTION_OTR) {
 					message.getConversation().endOtrIfNeeded();
 				}
 			}