From fdf7ea3c3e77e8cfbf433cffc99f430834aabf82 Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Thu, 15 Feb 2018 19:19:53 +0100
Subject: null check on invite object

---
 src/main/java/de/pixart/messenger/ui/StartConversationActivity.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/main/java/de/pixart/messenger/ui/StartConversationActivity.java')

diff --git a/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java b/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java
index 30c6b8d97..b66999eac 100644
--- a/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java
@@ -442,7 +442,7 @@ public class StartConversationActivity extends XmppActivity implements OnRosterU
                 }
 
             final Contact contact = account.getRoster().getContact(contactJid);
-            if (invite.getName() != null) {
+            if (invite != null && invite.getName() != null) {
                 contact.setServerName(invite.getName());
             }
             if (contact.isSelf()) {
-- 
cgit v1.2.3