diff --git a/core/src/main/java/haveno/core/trade/TradeManager.java b/core/src/main/java/haveno/core/trade/TradeManager.java
index 55acf63d87c..10db542eb13 100644
--- a/core/src/main/java/haveno/core/trade/TradeManager.java
+++ b/core/src/main/java/haveno/core/trade/TradeManager.java
@@ -958,6 +958,7 @@ public void onTradeCompleted(Trade trade) {
     }
 
     public void unregisterTrade(Trade trade) {
+        log.warn("Unregistering {} {}", trade.getClass().getSimpleName(), trade.getId());
         removeTrade(trade, true);
         removeFailedTrade(trade);
         requestPersistence();
diff --git a/core/src/main/java/haveno/core/trade/protocol/tasks/ProcessDepositResponse.java b/core/src/main/java/haveno/core/trade/protocol/tasks/ProcessDepositResponse.java
index e37c612136a..dcaf1a7e762 100644
--- a/core/src/main/java/haveno/core/trade/protocol/tasks/ProcessDepositResponse.java
+++ b/core/src/main/java/haveno/core/trade/protocol/tasks/ProcessDepositResponse.java
@@ -41,6 +41,7 @@ protected void run() {
           // throw if error
           DepositResponse message = (DepositResponse) processModel.getTradeMessage();
           if (message.getErrorMessage() != null) {
+            log.warn("Unregistering trade {} {} because deposit response has error message={}", trade.getClass().getSimpleName(), trade.getShortId(), message.getErrorMessage());
             trade.setStateIfValidTransitionTo(Trade.State.PUBLISH_DEPOSIT_TX_REQUEST_FAILED);
             processModel.getTradeManager().unregisterTrade(trade);
             throw new RuntimeException(message.getErrorMessage());
diff --git a/desktop/src/main/java/haveno/desktop/main/support/dispute/DisputeView.java b/desktop/src/main/java/haveno/desktop/main/support/dispute/DisputeView.java
index 9d88ad23fdc..f62761d430b 100644
--- a/desktop/src/main/java/haveno/desktop/main/support/dispute/DisputeView.java
+++ b/desktop/src/main/java/haveno/desktop/main/support/dispute/DisputeView.java
@@ -1415,7 +1415,7 @@ public void updateItem(final Dispute item, boolean empty) {
     private String getDisputeStateText(Dispute dispute) {
         Trade trade = tradeManager.getTrade(dispute.getTradeId());
         if (trade == null) {
-            log.warn("Dispute's trade is null for trade {}", dispute.getTradeId());
+            log.warn("Dispute's trade is null for trade {}, defaulting to dispute state text 'closed'", dispute.getTradeId());
             return Res.get("support.closed");
         }
         if (dispute.isClosed()) return Res.get("support.closed");