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()) {