2 files changed, 6 insertions, 1 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/EditAccountActivity.java b/src/main/java/de/pixart/messenger/ui/EditAccountActivity.java
index bec621534..9e4f15a36 100644
--- a/src/main/java/de/pixart/messenger/ui/EditAccountActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/EditAccountActivity.java
@@ -624,9 +624,11 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat
     }
 
     private void onEditYourNameClicked(View view) {
-        String nick = "";
+        String nick;
         if (mAccount.getDisplayName() != null) {
             nick = mAccount.getDisplayName();
+        } else {
+            nick = mAccount.getJid().getLocal();
         }
         quickEdit(nick, R.string.your_name, value -> {
             final String displayName = value.trim();
diff --git a/src/main/java/de/pixart/messenger/ui/XmppActivity.java b/src/main/java/de/pixart/messenger/ui/XmppActivity.java
index 28e57396d..10ca37c7c 100644
--- a/src/main/java/de/pixart/messenger/ui/XmppActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/XmppActivity.java
@@ -666,6 +666,9 @@ public abstract class XmppActivity extends ActionBarActivity {
     }
 
     protected void showAddToRosterDialog(final Contact contact) {
+        if (contact == null) {
+            return;
+        }
         AlertDialog.Builder builder = new AlertDialog.Builder(this);
         builder.setTitle(contact.getJid().toString());
         builder.setMessage(getString(R.string.not_in_roster));