diff --git a/src/main/java/io/bitsquare/btc/WalletService.java b/src/main/java/io/bitsquare/btc/WalletService.java
index 3a06f4c907..acaa1410b1 100644
--- a/src/main/java/io/bitsquare/btc/WalletService.java
+++ b/src/main/java/io/bitsquare/btc/WalletService.java
@@ -285,8 +285,10 @@ public class WalletService {
     }
 
     public void shutDown() {
-        wallet.removeEventListener(walletEventListener);
-        walletAppKit.stopAsync();
+        if (wallet != null)
+            wallet.removeEventListener(walletEventListener);
+        if (walletAppKit != null)
+            walletAppKit.stopAsync();
     }
 
     public Wallet getWallet() {