diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersDataModel.java b/gui/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersDataModel.java
index 739b4897a6..1477be425f 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersDataModel.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersDataModel.java
@@ -21,8 +21,8 @@ import io.bitsquare.offer.Direction;
 import io.bitsquare.offer.Offer;
 import io.bitsquare.trade.TradeManager;
 import io.bitsquare.user.User;
-import io.bitsquare.util.task.FaultHandler;
-import io.bitsquare.util.task.ResultHandler;
+import io.bitsquare.util.handlers.ErrorMessageHandler;
+import io.bitsquare.util.handlers.ResultHandler;
 
 import com.google.inject.Inject;
 
@@ -77,8 +77,8 @@ class OffersDataModel implements Activatable, DataModel {
         tradeManager.getOffers().removeListener(offerMapChangeListener);
     }
 
-    void removeOffer(Offer offer, ResultHandler resultHandler, FaultHandler faultHandler) {
-        tradeManager.requestRemoveOffer(offer, resultHandler, faultHandler);
+    void removeOffer(Offer offer, ResultHandler resultHandler, ErrorMessageHandler errorMessageHandler) {
+        tradeManager.requestRemoveOffer(offer, resultHandler, errorMessageHandler);
     }
 
 
diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersViewModel.java b/gui/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersViewModel.java
index b45e42b748..c5308340ce 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersViewModel.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/portfolio/offer/OffersViewModel.java
@@ -50,7 +50,7 @@ class OffersViewModel extends ActivatableWithDataModel<OffersDataModel> implemen
                     // visual feedback?
                     log.debug("Remove offer was successful");
                 },
-                (message, throwable) -> {
+                (message) -> {
                     log.error(message);
                     Popups.openWarningPopup("Remove offer failed", message);
                 });
diff --git a/gui/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookDataModel.java b/gui/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookDataModel.java
index 54c7ea4e41..3c02429490 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookDataModel.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookDataModel.java
@@ -26,8 +26,8 @@ import io.bitsquare.offer.Offer;
 import io.bitsquare.settings.Preferences;
 import io.bitsquare.trade.TradeManager;
 import io.bitsquare.user.User;
-import io.bitsquare.util.task.FaultHandler;
-import io.bitsquare.util.task.ResultHandler;
+import io.bitsquare.util.handlers.ErrorMessageHandler;
+import io.bitsquare.util.handlers.ResultHandler;
 
 import org.bitcoinj.core.Coin;
 import org.bitcoinj.utils.ExchangeRate;
@@ -116,8 +116,8 @@ class OfferBookDataModel implements Activatable, DataModel {
         btcCode.unbind();
     }
 
-    void removeOffer(Offer offer, ResultHandler resultHandler, FaultHandler faultHandler) {
-        tradeManager.requestRemoveOffer(offer, resultHandler, faultHandler);
+    void removeOffer(Offer offer, ResultHandler resultHandler, ErrorMessageHandler errorMessageHandler) {
+        tradeManager.requestRemoveOffer(offer, resultHandler, errorMessageHandler);
     }
 
     void calculateVolume() {
diff --git a/gui/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookViewModel.java b/gui/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookViewModel.java
index 40b3b9514c..88e6898844 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookViewModel.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/trade/offerbook/OfferBookViewModel.java
@@ -109,7 +109,7 @@ class OfferBookViewModel extends ActivatableWithDataModel<OfferBookDataModel> im
                     // visual feedback?
                     log.debug("Remove offer was successful");
                 },
-                (message, throwable) -> {
+                (message) -> {
                     log.error(message);
                     Popups.openWarningPopup("Remove offer failed", message);
                 }
diff --git a/gui/src/main/java/io/bitsquare/offer/RemoteOfferBook.java b/gui/src/main/java/io/bitsquare/offer/RemoteOfferBook.java
index fbcae74740..6e0ae1d0f3 100644
--- a/gui/src/main/java/io/bitsquare/offer/RemoteOfferBook.java
+++ b/gui/src/main/java/io/bitsquare/offer/RemoteOfferBook.java
@@ -17,8 +17,8 @@
 
 package io.bitsquare.offer;
 
-import io.bitsquare.util.task.FaultHandler;
-import io.bitsquare.util.task.ResultHandler;
+import io.bitsquare.util.handlers.FaultHandler;
+import io.bitsquare.util.handlers.ResultHandler;
 
 import java.util.List;
 import java.util.concurrent.Executor;
diff --git a/gui/src/main/java/io/bitsquare/offer/tomp2p/TomP2POfferBook.java b/gui/src/main/java/io/bitsquare/offer/tomp2p/TomP2POfferBook.java
index 29c579a6b0..0d2f38cf45 100644
--- a/gui/src/main/java/io/bitsquare/offer/tomp2p/TomP2POfferBook.java
+++ b/gui/src/main/java/io/bitsquare/offer/tomp2p/TomP2POfferBook.java
@@ -20,8 +20,8 @@ package io.bitsquare.offer.tomp2p;
 import io.bitsquare.msg.tomp2p.TomP2PNode;
 import io.bitsquare.offer.Offer;
 import io.bitsquare.offer.RemoteOfferBook;
-import io.bitsquare.util.task.FaultHandler;
-import io.bitsquare.util.task.ResultHandler;
+import io.bitsquare.util.handlers.FaultHandler;
+import io.bitsquare.util.handlers.ResultHandler;
 
 import java.io.IOException;
 
diff --git a/gui/src/main/java/io/bitsquare/trade/TradeManager.java b/gui/src/main/java/io/bitsquare/trade/TradeManager.java
index 67157d01d8..ffad461f81 100644
--- a/gui/src/main/java/io/bitsquare/trade/TradeManager.java
+++ b/gui/src/main/java/io/bitsquare/trade/TradeManager.java
@@ -48,9 +48,8 @@ import io.bitsquare.trade.protocol.trade.taker.messages.RequestOffererPublishDep
 import io.bitsquare.trade.protocol.trade.taker.messages.RequestTakeOfferMessage;
 import io.bitsquare.trade.protocol.trade.taker.messages.TakeOfferFeePayedMessage;
 import io.bitsquare.user.User;
-import io.bitsquare.util.task.ErrorMessageHandler;
-import io.bitsquare.util.task.FaultHandler;
-import io.bitsquare.util.task.ResultHandler;
+import io.bitsquare.util.handlers.ErrorMessageHandler;
+import io.bitsquare.util.handlers.ResultHandler;
 
 import org.bitcoinj.core.Coin;
 import org.bitcoinj.core.Transaction;
@@ -180,7 +179,7 @@ public class TradeManager {
                 remoteOfferBook,
                 (transaction) -> {
                     saveOffer(offer);
-                    resultHandler.onResult(transaction);
+                    resultHandler.handleResult(transaction);
                 },
                 (message, throwable) -> errorMessageHandler.handleErrorMessage(message)
         );
@@ -193,15 +192,20 @@ public class TradeManager {
         persistOffers();
     }
 
-    public void requestRemoveOffer(Offer offer, ResultHandler resultHandler, FaultHandler faultHandler) {
-        if (offers.containsKey(offer.getId()))
-            offers.remove(offer.getId());
-        else
-            log.error("offers does not contain the offer with the ID " + offer.getId());
-
-        persistOffers();
-
-        remoteOfferBook.removeOffer(offer, resultHandler, faultHandler);
+    public void requestRemoveOffer(Offer offer, ResultHandler resultHandler, ErrorMessageHandler errorMessageHandler) {
+        remoteOfferBook.removeOffer(offer,
+                () -> {
+                    if (offers.containsKey(offer.getId())) {
+                        offers.remove(offer.getId());
+                        persistOffers();
+                        resultHandler.handleResult();
+                    }
+                    else {
+                        log.error("Locally stored offers does not contain the offer with the ID " + offer.getId());
+                        errorMessageHandler.handleErrorMessage("Locally stored offers does not contain the offer with the ID " + offer.getId());
+                    }
+                },
+                (message, throwable) -> errorMessageHandler.handleErrorMessage(message));
     }
 
 
@@ -258,7 +262,7 @@ public class TradeManager {
                             persistPendingTrades();
                             requestRemoveOffer(offer,
                                     () -> log.debug("remove was successful"),
-                                    (message, throwable) -> log.error(message));
+                                    (message) -> log.error(message));
                         }
 
                         @Override
diff --git a/gui/src/main/java/io/bitsquare/trade/handlers/TransactionResultHandler.java b/gui/src/main/java/io/bitsquare/trade/handlers/TransactionResultHandler.java
index 20e4edc4ba..8c36c6942a 100644
--- a/gui/src/main/java/io/bitsquare/trade/handlers/TransactionResultHandler.java
+++ b/gui/src/main/java/io/bitsquare/trade/handlers/TransactionResultHandler.java
@@ -20,5 +20,5 @@ package io.bitsquare.trade.handlers;
 import org.bitcoinj.core.Transaction;
 
 public interface TransactionResultHandler {
-    void onResult(Transaction transaction);
+    void handleResult(Transaction transaction);
 }
diff --git a/gui/src/main/java/io/bitsquare/trade/protocol/placeoffer/PlaceOfferProtocol.java b/gui/src/main/java/io/bitsquare/trade/protocol/placeoffer/PlaceOfferProtocol.java
index 5ec17eea24..fc10bd5204 100644
--- a/gui/src/main/java/io/bitsquare/trade/protocol/placeoffer/PlaceOfferProtocol.java
+++ b/gui/src/main/java/io/bitsquare/trade/protocol/placeoffer/PlaceOfferProtocol.java
@@ -21,7 +21,7 @@ import io.bitsquare.btc.WalletService;
 import io.bitsquare.offer.Offer;
 import io.bitsquare.offer.RemoteOfferBook;
 import io.bitsquare.trade.handlers.TransactionResultHandler;
-import io.bitsquare.util.task.FaultHandler;
+import io.bitsquare.util.handlers.FaultHandler;
 
 import org.bitcoinj.core.InsufficientMoneyException;
 import org.bitcoinj.core.Transaction;
@@ -108,7 +108,7 @@ public class PlaceOfferProtocol {
                         Exception ex = new Exception("Broadcast of offer fee payment failed because transaction = null.");
                         faultHandler.handleFault("Broadcast of offer fee payment failed.", ex);
                     }
-                    resultHandler1.onResult(transaction);
+                    resultHandler1.handleResult(transaction);
                 }
 
                 @Override
@@ -131,7 +131,7 @@ public class PlaceOfferProtocol {
         
         remoteOfferBook.addOffer(offer,
                 () -> {
-                    resultHandler.onResult(transaction);
+                    resultHandler.handleResult(transaction);
                 },
                 (message, throwable) -> {
                     repeatAddOfferCallCounter++;
diff --git a/gui/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/CreateDepositTx.java b/gui/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/CreateDepositTx.java
index 5c007020f1..dc70a3bb30 100644
--- a/gui/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/CreateDepositTx.java
+++ b/gui/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/CreateDepositTx.java
@@ -18,7 +18,7 @@
 package io.bitsquare.trade.protocol.trade.offerer.tasks;
 
 import io.bitsquare.btc.WalletService;
-import io.bitsquare.util.task.ExceptionHandler;
+import io.bitsquare.util.handlers.ExceptionHandler;
 
 import org.bitcoinj.core.Coin;
 import org.bitcoinj.core.InsufficientMoneyException;
diff --git a/gui/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/HandleTakeOfferRequest.java b/gui/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/HandleTakeOfferRequest.java
index 9c56602e9d..dd7727285d 100644
--- a/gui/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/HandleTakeOfferRequest.java
+++ b/gui/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/HandleTakeOfferRequest.java
@@ -22,7 +22,7 @@ import io.bitsquare.msg.listeners.OutgoingMessageListener;
 import io.bitsquare.network.Peer;
 import io.bitsquare.trade.Trade;
 import io.bitsquare.trade.protocol.trade.offerer.messages.RespondToTakeOfferRequestMessage;
-import io.bitsquare.util.task.ExceptionHandler;
+import io.bitsquare.util.handlers.ExceptionHandler;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/gui/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/RequestTakerDepositPayment.java b/gui/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/RequestTakerDepositPayment.java
index bf5bb9d0fb..569bf3c73e 100644
--- a/gui/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/RequestTakerDepositPayment.java
+++ b/gui/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/RequestTakerDepositPayment.java
@@ -22,8 +22,8 @@ import io.bitsquare.msg.MessageService;
 import io.bitsquare.msg.listeners.OutgoingMessageListener;
 import io.bitsquare.network.Peer;
 import io.bitsquare.trade.protocol.trade.offerer.messages.RequestTakerDepositPaymentMessage;
-import io.bitsquare.util.task.ExceptionHandler;
-import io.bitsquare.util.task.ResultHandler;
+import io.bitsquare.util.handlers.ExceptionHandler;
+import io.bitsquare.util.handlers.ResultHandler;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/gui/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SendDepositTxIdToTaker.java b/gui/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SendDepositTxIdToTaker.java
index 21d6aece9d..55e513111c 100644
--- a/gui/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SendDepositTxIdToTaker.java
+++ b/gui/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SendDepositTxIdToTaker.java
@@ -21,8 +21,8 @@ import io.bitsquare.msg.MessageService;
 import io.bitsquare.msg.listeners.OutgoingMessageListener;
 import io.bitsquare.network.Peer;
 import io.bitsquare.trade.protocol.trade.offerer.messages.DepositTxPublishedMessage;
-import io.bitsquare.util.task.ExceptionHandler;
-import io.bitsquare.util.task.ResultHandler;
+import io.bitsquare.util.handlers.ExceptionHandler;
+import io.bitsquare.util.handlers.ResultHandler;
 
 import org.bitcoinj.core.Transaction;
 import org.bitcoinj.core.Utils;
diff --git a/gui/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SendSignedPayoutTx.java b/gui/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SendSignedPayoutTx.java
index e9b7b3bbc9..63b7540968 100644
--- a/gui/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SendSignedPayoutTx.java
+++ b/gui/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SendSignedPayoutTx.java
@@ -22,8 +22,8 @@ import io.bitsquare.msg.MessageService;
 import io.bitsquare.msg.listeners.OutgoingMessageListener;
 import io.bitsquare.network.Peer;
 import io.bitsquare.trade.protocol.trade.offerer.messages.BankTransferInitedMessage;
-import io.bitsquare.util.task.ExceptionHandler;
-import io.bitsquare.util.task.ResultHandler;
+import io.bitsquare.util.handlers.ExceptionHandler;
+import io.bitsquare.util.handlers.ResultHandler;
 
 import org.bitcoinj.core.Coin;
 import org.bitcoinj.core.ECKey;
diff --git a/gui/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SetupListenerForBlockChainConfirmation.java b/gui/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SetupListenerForBlockChainConfirmation.java
index 982e5d11ac..b6e35b870b 100644
--- a/gui/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SetupListenerForBlockChainConfirmation.java
+++ b/gui/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SetupListenerForBlockChainConfirmation.java
@@ -18,7 +18,7 @@
 package io.bitsquare.trade.protocol.trade.offerer.tasks;
 
 import io.bitsquare.trade.protocol.trade.offerer.BuyerAcceptsOfferProtocolListener;
-import io.bitsquare.util.task.ResultHandler;
+import io.bitsquare.util.handlers.ResultHandler;
 
 import org.bitcoinj.core.Transaction;
 import org.bitcoinj.core.TransactionConfidence;
diff --git a/gui/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SignAndPublishDepositTx.java b/gui/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SignAndPublishDepositTx.java
index 48dcc9bb2b..e76c053dcf 100644
--- a/gui/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SignAndPublishDepositTx.java
+++ b/gui/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SignAndPublishDepositTx.java
@@ -18,7 +18,7 @@
 package io.bitsquare.trade.protocol.trade.offerer.tasks;
 
 import io.bitsquare.btc.WalletService;
-import io.bitsquare.util.task.ExceptionHandler;
+import io.bitsquare.util.handlers.ExceptionHandler;
 
 import org.bitcoinj.core.Transaction;
 
diff --git a/gui/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/VerifyAndSignContract.java b/gui/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/VerifyAndSignContract.java
index 88c784ea0e..62aaa7b73b 100644
--- a/gui/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/VerifyAndSignContract.java
+++ b/gui/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/VerifyAndSignContract.java
@@ -22,7 +22,7 @@ import io.bitsquare.crypto.SignatureService;
 import io.bitsquare.offer.Offer;
 import io.bitsquare.trade.Contract;
 import io.bitsquare.util.Utilities;
-import io.bitsquare.util.task.ExceptionHandler;
+import io.bitsquare.util.handlers.ExceptionHandler;
 
 import org.bitcoinj.core.Coin;
 import org.bitcoinj.core.ECKey;
diff --git a/gui/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/VerifyTakeOfferFeePayment.java b/gui/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/VerifyTakeOfferFeePayment.java
index f81f2a468c..1d3c72109e 100644
--- a/gui/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/VerifyTakeOfferFeePayment.java
+++ b/gui/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/VerifyTakeOfferFeePayment.java
@@ -18,8 +18,8 @@
 package io.bitsquare.trade.protocol.trade.offerer.tasks;
 
 import io.bitsquare.btc.WalletService;
-import io.bitsquare.util.task.ExceptionHandler;
-import io.bitsquare.util.task.ResultHandler;
+import io.bitsquare.util.handlers.ExceptionHandler;
+import io.bitsquare.util.handlers.ResultHandler;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/gui/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/VerifyTakerAccount.java b/gui/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/VerifyTakerAccount.java
index 28b15a7b98..a4fd2afc33 100644
--- a/gui/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/VerifyTakerAccount.java
+++ b/gui/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/VerifyTakerAccount.java
@@ -20,8 +20,8 @@ package io.bitsquare.trade.protocol.trade.offerer.tasks;
 import io.bitsquare.bank.BankAccount;
 import io.bitsquare.btc.BlockChainService;
 import io.bitsquare.trade.protocol.trade.shared.tasks.VerifyPeerAccount;
-import io.bitsquare.util.task.ExceptionHandler;
-import io.bitsquare.util.task.ResultHandler;
+import io.bitsquare.util.handlers.ExceptionHandler;
+import io.bitsquare.util.handlers.ResultHandler;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/gui/src/main/java/io/bitsquare/trade/protocol/trade/shared/tasks/VerifyPeerAccount.java b/gui/src/main/java/io/bitsquare/trade/protocol/trade/shared/tasks/VerifyPeerAccount.java
index a149a8a169..d65bc43495 100644
--- a/gui/src/main/java/io/bitsquare/trade/protocol/trade/shared/tasks/VerifyPeerAccount.java
+++ b/gui/src/main/java/io/bitsquare/trade/protocol/trade/shared/tasks/VerifyPeerAccount.java
@@ -19,8 +19,8 @@ package io.bitsquare.trade.protocol.trade.shared.tasks;
 
 import io.bitsquare.bank.BankAccount;
 import io.bitsquare.btc.BlockChainService;
-import io.bitsquare.util.task.ExceptionHandler;
-import io.bitsquare.util.task.ResultHandler;
+import io.bitsquare.util.handlers.ExceptionHandler;
+import io.bitsquare.util.handlers.ResultHandler;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/gui/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/CreateAndSignContract.java b/gui/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/CreateAndSignContract.java
index 79ee3ce91f..5fe42df69e 100644
--- a/gui/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/CreateAndSignContract.java
+++ b/gui/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/CreateAndSignContract.java
@@ -22,7 +22,7 @@ import io.bitsquare.crypto.SignatureService;
 import io.bitsquare.offer.Offer;
 import io.bitsquare.trade.Contract;
 import io.bitsquare.util.Utilities;
-import io.bitsquare.util.task.ExceptionHandler;
+import io.bitsquare.util.handlers.ExceptionHandler;
 
 import org.bitcoinj.core.Coin;
 import org.bitcoinj.core.ECKey;
diff --git a/gui/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/GetPeerAddress.java b/gui/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/GetPeerAddress.java
index 3db9dd46d9..2a8c5b9cf6 100644
--- a/gui/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/GetPeerAddress.java
+++ b/gui/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/GetPeerAddress.java
@@ -20,7 +20,7 @@ package io.bitsquare.trade.protocol.trade.taker.tasks;
 import io.bitsquare.msg.MessageService;
 import io.bitsquare.msg.listeners.GetPeerAddressListener;
 import io.bitsquare.network.Peer;
-import io.bitsquare.util.task.ExceptionHandler;
+import io.bitsquare.util.handlers.ExceptionHandler;
 
 import java.security.PublicKey;
 
diff --git a/gui/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/PayDeposit.java b/gui/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/PayDeposit.java
index 7eafc1bdb4..f8204af787 100644
--- a/gui/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/PayDeposit.java
+++ b/gui/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/PayDeposit.java
@@ -18,7 +18,7 @@
 package io.bitsquare.trade.protocol.trade.taker.tasks;
 
 import io.bitsquare.btc.WalletService;
-import io.bitsquare.util.task.ExceptionHandler;
+import io.bitsquare.util.handlers.ExceptionHandler;
 
 import org.bitcoinj.core.Coin;
 import org.bitcoinj.core.InsufficientMoneyException;
diff --git a/gui/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/PayTakeOfferFee.java b/gui/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/PayTakeOfferFee.java
index 3393019df9..7059571000 100644
--- a/gui/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/PayTakeOfferFee.java
+++ b/gui/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/PayTakeOfferFee.java
@@ -18,7 +18,7 @@
 package io.bitsquare.trade.protocol.trade.taker.tasks;
 
 import io.bitsquare.btc.WalletService;
-import io.bitsquare.util.task.ExceptionHandler;
+import io.bitsquare.util.handlers.ExceptionHandler;
 
 import org.bitcoinj.core.InsufficientMoneyException;
 import org.bitcoinj.core.Transaction;
diff --git a/gui/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/RequestTakeOffer.java b/gui/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/RequestTakeOffer.java
index 104d0f3a41..cb44799953 100644
--- a/gui/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/RequestTakeOffer.java
+++ b/gui/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/RequestTakeOffer.java
@@ -21,8 +21,8 @@ import io.bitsquare.msg.MessageService;
 import io.bitsquare.msg.listeners.OutgoingMessageListener;
 import io.bitsquare.network.Peer;
 import io.bitsquare.trade.protocol.trade.taker.messages.RequestTakeOfferMessage;
-import io.bitsquare.util.task.ExceptionHandler;
-import io.bitsquare.util.task.ResultHandler;
+import io.bitsquare.util.handlers.ExceptionHandler;
+import io.bitsquare.util.handlers.ResultHandler;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/gui/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SendPayoutTxToOfferer.java b/gui/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SendPayoutTxToOfferer.java
index 6d638c18e2..dc0e9bf3ce 100644
--- a/gui/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SendPayoutTxToOfferer.java
+++ b/gui/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SendPayoutTxToOfferer.java
@@ -21,8 +21,8 @@ import io.bitsquare.msg.MessageService;
 import io.bitsquare.msg.listeners.OutgoingMessageListener;
 import io.bitsquare.network.Peer;
 import io.bitsquare.trade.protocol.trade.taker.messages.PayoutTxPublishedMessage;
-import io.bitsquare.util.task.ExceptionHandler;
-import io.bitsquare.util.task.ResultHandler;
+import io.bitsquare.util.handlers.ExceptionHandler;
+import io.bitsquare.util.handlers.ResultHandler;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/gui/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SendSignedTakerDepositTxAsHex.java b/gui/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SendSignedTakerDepositTxAsHex.java
index fa35314570..dbc1673725 100644
--- a/gui/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SendSignedTakerDepositTxAsHex.java
+++ b/gui/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SendSignedTakerDepositTxAsHex.java
@@ -23,8 +23,8 @@ import io.bitsquare.msg.MessageService;
 import io.bitsquare.msg.listeners.OutgoingMessageListener;
 import io.bitsquare.network.Peer;
 import io.bitsquare.trade.protocol.trade.taker.messages.RequestOffererPublishDepositTxMessage;
-import io.bitsquare.util.task.ExceptionHandler;
-import io.bitsquare.util.task.ResultHandler;
+import io.bitsquare.util.handlers.ExceptionHandler;
+import io.bitsquare.util.handlers.ResultHandler;
 
 import org.bitcoinj.core.Transaction;
 import org.bitcoinj.core.Utils;
diff --git a/gui/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SendTakeOfferFeePayedTxId.java b/gui/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SendTakeOfferFeePayedTxId.java
index 481c4b199c..08b2708c4c 100644
--- a/gui/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SendTakeOfferFeePayedTxId.java
+++ b/gui/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SendTakeOfferFeePayedTxId.java
@@ -21,8 +21,8 @@ import io.bitsquare.msg.MessageService;
 import io.bitsquare.msg.listeners.OutgoingMessageListener;
 import io.bitsquare.network.Peer;
 import io.bitsquare.trade.protocol.trade.taker.messages.TakeOfferFeePayedMessage;
-import io.bitsquare.util.task.ExceptionHandler;
-import io.bitsquare.util.task.ResultHandler;
+import io.bitsquare.util.handlers.ExceptionHandler;
+import io.bitsquare.util.handlers.ResultHandler;
 
 import org.bitcoinj.core.Coin;
 
diff --git a/gui/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SignAndPublishPayoutTx.java b/gui/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SignAndPublishPayoutTx.java
index 821bc291f6..15be8475e5 100644
--- a/gui/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SignAndPublishPayoutTx.java
+++ b/gui/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SignAndPublishPayoutTx.java
@@ -18,7 +18,7 @@
 package io.bitsquare.trade.protocol.trade.taker.tasks;
 
 import io.bitsquare.btc.WalletService;
-import io.bitsquare.util.task.ExceptionHandler;
+import io.bitsquare.util.handlers.ExceptionHandler;
 
 import org.bitcoinj.core.Coin;
 import org.bitcoinj.core.Transaction;
diff --git a/gui/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/VerifyOffererAccount.java b/gui/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/VerifyOffererAccount.java
index 79ca334b1c..6e4290eee3 100644
--- a/gui/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/VerifyOffererAccount.java
+++ b/gui/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/VerifyOffererAccount.java
@@ -20,8 +20,8 @@ package io.bitsquare.trade.protocol.trade.taker.tasks;
 import io.bitsquare.bank.BankAccount;
 import io.bitsquare.btc.BlockChainService;
 import io.bitsquare.trade.protocol.trade.shared.tasks.VerifyPeerAccount;
-import io.bitsquare.util.task.ExceptionHandler;
-import io.bitsquare.util.task.ResultHandler;
+import io.bitsquare.util.handlers.ExceptionHandler;
+import io.bitsquare.util.handlers.ResultHandler;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/gui/src/main/java/io/bitsquare/util/task/ErrorMessageHandler.java b/gui/src/main/java/io/bitsquare/util/handlers/ErrorMessageHandler.java
similarity index 95%
rename from gui/src/main/java/io/bitsquare/util/task/ErrorMessageHandler.java
rename to gui/src/main/java/io/bitsquare/util/handlers/ErrorMessageHandler.java
index db4cf95fa8..5f481b2191 100644
--- a/gui/src/main/java/io/bitsquare/util/task/ErrorMessageHandler.java
+++ b/gui/src/main/java/io/bitsquare/util/handlers/ErrorMessageHandler.java
@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.util.task;
+package io.bitsquare.util.handlers;
 
 /**
  * For reporting error message only (UI)
diff --git a/gui/src/main/java/io/bitsquare/util/task/ExceptionHandler.java b/gui/src/main/java/io/bitsquare/util/handlers/ExceptionHandler.java
similarity index 95%
rename from gui/src/main/java/io/bitsquare/util/task/ExceptionHandler.java
rename to gui/src/main/java/io/bitsquare/util/handlers/ExceptionHandler.java
index f598cd3585..1c0c9680e7 100644
--- a/gui/src/main/java/io/bitsquare/util/task/ExceptionHandler.java
+++ b/gui/src/main/java/io/bitsquare/util/handlers/ExceptionHandler.java
@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.util.task;
+package io.bitsquare.util.handlers;
 
 /**
  * For reporting throwables only
diff --git a/gui/src/main/java/io/bitsquare/util/task/FaultHandler.java b/gui/src/main/java/io/bitsquare/util/handlers/FaultHandler.java
similarity index 95%
rename from gui/src/main/java/io/bitsquare/util/task/FaultHandler.java
rename to gui/src/main/java/io/bitsquare/util/handlers/FaultHandler.java
index ecb0bb2874..aa2d8e47bb 100644
--- a/gui/src/main/java/io/bitsquare/util/task/FaultHandler.java
+++ b/gui/src/main/java/io/bitsquare/util/handlers/FaultHandler.java
@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.util.task;
+package io.bitsquare.util.handlers;
 
 /**
  * For reporting a description message and throwable
diff --git a/gui/src/main/java/io/bitsquare/util/task/ResultHandler.java b/gui/src/main/java/io/bitsquare/util/handlers/ResultHandler.java
similarity index 95%
rename from gui/src/main/java/io/bitsquare/util/task/ResultHandler.java
rename to gui/src/main/java/io/bitsquare/util/handlers/ResultHandler.java
index bb8f25c8ed..6a4f19ed88 100644
--- a/gui/src/main/java/io/bitsquare/util/task/ResultHandler.java
+++ b/gui/src/main/java/io/bitsquare/util/handlers/ResultHandler.java
@@ -15,7 +15,7 @@
  * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package io.bitsquare.util.task;
+package io.bitsquare.util.handlers;
 
 public interface ResultHandler {
     void handleResult();
diff --git a/gui/src/test/java/io/bitsquare/trade/protocol/placeoffer/PlaceOfferProtocolTest.java b/gui/src/test/java/io/bitsquare/trade/protocol/placeoffer/PlaceOfferProtocolTest.java
index 5b0d60d744..21d4d1f096 100644
--- a/gui/src/test/java/io/bitsquare/trade/protocol/placeoffer/PlaceOfferProtocolTest.java
+++ b/gui/src/test/java/io/bitsquare/trade/protocol/placeoffer/PlaceOfferProtocolTest.java
@@ -38,7 +38,7 @@ import io.bitsquare.persistence.Persistence;
 import io.bitsquare.trade.handlers.TransactionResultHandler;
 import io.bitsquare.user.User;
 import io.bitsquare.util.DSAKeyUtil;
-import io.bitsquare.util.task.FaultHandler;
+import io.bitsquare.util.handlers.FaultHandler;
 
 import org.bitcoinj.core.Address;
 import org.bitcoinj.core.Coin;