1 files changed, 9 insertions, 4 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/EditAccountActivity.java b/src/main/java/de/pixart/messenger/ui/EditAccountActivity.java
index d482b7326..129f5400e 100644
--- a/src/main/java/de/pixart/messenger/ui/EditAccountActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/EditAccountActivity.java
@@ -625,10 +625,15 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat
 
     private void onEditYourNameClicked(View view) {
         String nick;
-        if (mAccount.getDisplayName() != null) {
-            nick = mAccount.getDisplayName();
-        } else {
-            nick = mAccount.getJid().getLocal();
+        try {
+            if (mAccount.getDisplayName() != null) {
+                nick = mAccount.getDisplayName();
+            } else {
+                nick = mAccount.getJid().getLocal();
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            nick = "";
         }
         quickEdit(nick, R.string.your_name, value -> {
             final String displayName = value.trim();