diff --git a/core/src/main/java/haveno/core/api/XmrConnectionService.java b/core/src/main/java/haveno/core/api/XmrConnectionService.java
index b0e1a962..48ba17b5 100644
--- a/core/src/main/java/haveno/core/api/XmrConnectionService.java
+++ b/core/src/main/java/haveno/core/api/XmrConnectionService.java
@@ -649,9 +649,6 @@ public final class XmrConnectionService {
                     log.info("Successfully fetched daemon info after previous error");
                     lastErrorTimestamp = null;
                 }
-
-                // clear error message
-                if (HavenoUtils.havenoSetup != null) HavenoUtils.havenoSetup.getWalletServiceErrorMsg().set(null);
             } catch (Exception e) {
 
                 // not connected to daemon
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 0e4726f6..933b2590 100644
--- a/core/src/main/java/haveno/core/xmr/wallet/XmrWalletService.java
+++ b/core/src/main/java/haveno/core/xmr/wallet/XmrWalletService.java
@@ -1321,6 +1321,7 @@ public class XmrWalletService {
         } catch (Exception e) {
             log.warn("Error initializing main wallet: " + e.getMessage());
             e.printStackTrace();
+            HavenoUtils.havenoSetup.getWalletServiceErrorMsg().set(e.getMessage());
             throw e;
         }
     }
@@ -1592,7 +1593,7 @@ public class XmrWalletService {
         } catch (Exception e) {
             e.printStackTrace();
             if (walletRpc != null) forceCloseWallet(walletRpc, config.getPath());
-            throw new IllegalStateException("Could not open wallet '" + config.getPath() + "'. Please close Haveno, stop all monero-wallet-rpc processes, and restart Haveno.");
+            throw new IllegalStateException("Could not open wallet '" + config.getPath() + "'. Please close Haveno, stop all monero-wallet-rpc processes, and restart Haveno.\n\nError message: " + e.getMessage());
         }
     }