From 0ad9a927646d1f63868317fe2ebf7131ebe28b22 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Mon, 13 Feb 2017 14:48:13 +0300
Subject: juick-xmpp: fix NPE

---
 juick-xmpp/src/main/java/com/juick/components/s2s/JuickBot.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'juick-xmpp')

diff --git a/juick-xmpp/src/main/java/com/juick/components/s2s/JuickBot.java b/juick-xmpp/src/main/java/com/juick/components/s2s/JuickBot.java
index c0d5df81..0fff6af3 100644
--- a/juick-xmpp/src/main/java/com/juick/components/s2s/JuickBot.java
+++ b/juick-xmpp/src/main/java/com/juick/components/s2s/JuickBot.java
@@ -158,7 +158,7 @@ public class JuickBot implements StanzaListener, AutoCloseable {
     }
 
     public boolean incomingMessage(Message msg) {
-        if (StringUtils.isBlank(msg.getBody()) || msg.getType().equals(Message.Type.ERROR)) {
+        if (StringUtils.isBlank(msg.getBody()) || (msg.getType() != null && msg.getType().equals(Message.Type.ERROR))) {
             return false;
         }
 
-- 
cgit v1.2.3