diff --git a/src/main/java/io/bitsquare/msg/tomp2p/TomP2PNode.java b/src/main/java/io/bitsquare/msg/tomp2p/TomP2PNode.java
index 812a549b63..1c913754b9 100644
--- a/src/main/java/io/bitsquare/msg/tomp2p/TomP2PNode.java
+++ b/src/main/java/io/bitsquare/msg/tomp2p/TomP2PNode.java
@@ -127,8 +127,10 @@ public class TomP2PNode implements ClientNode {
             public void onSuccess(@Nullable PeerDHT peerDHT) {
                 if (peerDHT != null) {
                     TomP2PNode.this.peerDHT = peerDHT;
+                    setupTimerForIPCheck();
+                    setupReplyHandler();
                     try {
-                        setup();
+                        storeAddress();
                     } catch (NetworkException e) {
                         Platform.runLater(() -> bootstrapListener.onFailed(e));
                     }
@@ -149,12 +151,6 @@ public class TomP2PNode implements ClientNode {
         });
     }
 
-    private void setup() throws NetworkException {
-        setupTimerForIPCheck();
-        setupReplyHandler();
-        storeAddress();
-    }
-
     public void shutDown() {
         if (peerDHT != null)
             peerDHT.shutdown();
diff --git a/src/main/java/io/bitsquare/trade/protocol/createoffer/CreateOfferCoordinator.java b/src/main/java/io/bitsquare/trade/protocol/createoffer/CreateOfferCoordinator.java
index 1b0a072ae1..9d5f4912b8 100644
--- a/src/main/java/io/bitsquare/trade/protocol/createoffer/CreateOfferCoordinator.java
+++ b/src/main/java/io/bitsquare/trade/protocol/createoffer/CreateOfferCoordinator.java
@@ -85,12 +85,7 @@ public class CreateOfferCoordinator {
                                 new Exception("Offer fee payment failed. Transaction = null."));
                         return;
                     }
-
-                    try {
-                        offerRepository.addOffer(offer, () -> resultHandler.onResult(transaction), faultHandler);
-                    } catch (Exception e) {
-                        faultHandler.handleFault("Offer fee payment failed.", e);
-                    }
+                    offerRepository.addOffer(offer, () -> resultHandler.onResult(transaction), faultHandler);
                 }
 
                 @Override