From d3e755ceb10e2a4d783c1851ee3875efd64b6d5f Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Tue, 13 Feb 2018 15:20:30 +0100
Subject: [PATCH] null check on invite object

---
 .../eu/siacs/conversations/ui/StartConversationActivity.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
index 8e86ccdb2..cdc13d45b 100644
--- a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
@@ -423,7 +423,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()) {