diff --git a/core/src/main/java/haveno/core/xmr/wallet/XmrWalletService.java b/core/src/main/java/haveno/core/xmr/wallet/XmrWalletService.java index 2e609d77..1206b037 100644 --- a/core/src/main/java/haveno/core/xmr/wallet/XmrWalletService.java +++ b/core/src/main/java/haveno/core/xmr/wallet/XmrWalletService.java @@ -1758,9 +1758,11 @@ public class XmrWalletService { private void forceCloseMainWallet() { stopPolling(); - isClosingWallet = true; - forceCloseWallet(wallet, getWalletPath(MONERO_WALLET_NAME)); - wallet = null; + if (wallet != null) { + isClosingWallet = true; + forceCloseWallet(wallet, getWalletPath(MONERO_WALLET_NAME)); + wallet = null; + } } private void forceRestartMainWallet() {