From 86a49e0d9a575d1d628a3a71c19cc24a447c1688 Mon Sep 17 00:00:00 2001
From: Craig Raw <craigraw@gmail.com>
Date: Mon, 27 Sep 2021 10:08:48 +0200
Subject: [PATCH] fix npe showing the mix to dialog when non-standard wallets
 are loaded

---
 .../java/com/sparrowwallet/sparrow/wallet/MixToController.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/sparrowwallet/sparrow/wallet/MixToController.java b/src/main/java/com/sparrowwallet/sparrow/wallet/MixToController.java
index 538bd197..6aebc2be 100644
--- a/src/main/java/com/sparrowwallet/sparrow/wallet/MixToController.java
+++ b/src/main/java/com/sparrowwallet/sparrow/wallet/MixToController.java
@@ -45,7 +45,7 @@ public class MixToController implements Initializable {
 
         List<Wallet> destinationWallets = AppServices.get().getOpenWallets().keySet().stream().filter(openWallet -> openWallet.isValid()
                 && openWallet != wallet && openWallet != wallet.getMasterWallet()
-                && !StandardAccount.WHIRLPOOL_ACCOUNTS.contains(openWallet.getStandardAccountType())).collect(Collectors.toList());
+                && (openWallet.getStandardAccountType() == null || !StandardAccount.WHIRLPOOL_ACCOUNTS.contains(openWallet.getStandardAccountType()))).collect(Collectors.toList());
         allWallets.addAll(destinationWallets);
 
         mixToWallets.setItems(FXCollections.observableList(allWallets));