fixed npe in error message handling

2015-07-21 19:44:25 +02:00 · 2015-07-21 19:44:25 +02:00 · f6281a182d
parent 0d679a7abb
commit f6281a182d
1 changed files with 1 additions and 1 deletions
--- 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();
 				}
 			}