diff options
Diffstat (limited to 'src/main/java')
| -rw-r--r-- | src/main/java/de/pixart/messenger/ui/StartConversationActivity.java | 2 |
1 files changed, 1 insertions, 1 deletions
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()) { |