diff --git a/bootstrap/src/main/java/io/bitsquare/app/bootstrap/BootstrapNode.java b/bootstrap/src/main/java/io/bitsquare/app/bootstrap/BootstrapNode.java
index 8804100b75..be4d91029b 100644
--- a/bootstrap/src/main/java/io/bitsquare/app/bootstrap/BootstrapNode.java
+++ b/bootstrap/src/main/java/io/bitsquare/app/bootstrap/BootstrapNode.java
@@ -104,16 +104,17 @@ public class BootstrapNode {
                         for (PeerAddress peerAddress : peer.peerBean().peerMap().all()) {
                             log.info("Peer: " + peerAddress.toString());
                         }
-                        try {
-                            Thread.sleep(10000);
-                        } catch (InterruptedException e) {
-                            return;
-                        }
                     }
                     else if (noPeersInfoPrinted) {
                         log.info("No peers online");
                         noPeersInfoPrinted = true;
                     }
+                    try {
+                        Thread.sleep(10000);
+                    } catch (InterruptedException e) {
+                        e.printStackTrace();
+                        return;
+                    }
                 }
             }).start();
 
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SetupListenerForBlockChainConfirmation.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SetupListenerForBlockChainConfirmation.java
index 81e54d2446..96b22cb22b 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SetupListenerForBlockChainConfirmation.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SetupListenerForBlockChainConfirmation.java
@@ -28,7 +28,6 @@ import org.bitcoinj.core.TransactionConfidence;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-// TODO should be removed
 public class SetupListenerForBlockChainConfirmation extends Task<BuyerAsOffererModel> {
     private static final Logger log = LoggerFactory.getLogger(SetupListenerForBlockChainConfirmation.class);
 
@@ -47,8 +46,8 @@ public class SetupListenerForBlockChainConfirmation extends Task<BuyerAsOffererM
 
                     model.getTrade().setState(Trade.State.DEPOSIT_CONFIRMED);
 
-                    //TODO not sure if that works
-                    confidence.removeEventListener(this);
+                    boolean removed = confidence.removeEventListener(this);
+                    log.debug("listener removed? "+removed);
                 }
             }
         });