diff --git a/app/src/main/java/com/m2049r/xmrwallet/WalletActivity.java b/app/src/main/java/com/m2049r/xmrwallet/WalletActivity.java
index 400294f..5af5778 100644
--- a/app/src/main/java/com/m2049r/xmrwallet/WalletActivity.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/WalletActivity.java
@@ -579,10 +579,9 @@ public class WalletActivity extends BaseActivity implements WalletFragment.Liste
         });
         if (numAccounts != wallet.getNumAccounts()) {
             numAccounts = wallet.getNumAccounts();
-            runOnUiThread(new Runnable() {
-                public void run() {
+            runOnUiThread(() -> {
+                if (getWallet() != null)
                     updateAccountsList();
-                }
             });
         }
         try {