diff --git a/core/src/main/java/io/bitsquare/btc/pricefeed/PriceFeed.java b/core/src/main/java/io/bitsquare/btc/pricefeed/PriceFeed.java
index 00b8e6a6ef..e1b6115d25 100644
--- a/core/src/main/java/io/bitsquare/btc/pricefeed/PriceFeed.java
+++ b/core/src/main/java/io/bitsquare/btc/pricefeed/PriceFeed.java
@@ -194,8 +194,10 @@ public class PriceFeed {
             Futures.addCallback(future, new FutureCallback<MarketPrice>() {
                 public void onSuccess(MarketPrice marketPrice) {
                     UserThread.execute(() -> {
-                        cache.put(marketPrice.currencyCode, marketPrice);
-                        priceConsumer.accept(marketPrice.getPrice(type));
+                        if (marketPrice != null && priceConsumer != null) {
+                            cache.put(marketPrice.currencyCode, marketPrice);
+                            priceConsumer.accept(marketPrice.getPrice(type));
+                        }
                     });
                 }
 
diff --git a/network/src/main/java/io/bitsquare/p2p/network/Connection.java b/network/src/main/java/io/bitsquare/p2p/network/Connection.java
index c15ce77c96..a50c4a89d0 100644
--- a/network/src/main/java/io/bitsquare/p2p/network/Connection.java
+++ b/network/src/main/java/io/bitsquare/p2p/network/Connection.java
@@ -696,7 +696,7 @@ public class Connection implements MessageListener {
                             exceeds = size > MAX_MSG_SIZE_GET_DATA;
                         else
                             exceeds = size > MAX_MSG_SIZE;
-                        
+
                         if (exceeds)
                             log.warn("size > MAX_MSG_SIZE. size={}; object={}", size, message);
 
@@ -793,7 +793,8 @@ public class Connection implements MessageListener {
                     } catch (Throwable t) {
                         t.printStackTrace();
                         stop();
-                        sharedModel.handleConnectionException(new Exception(t));
+                        if (sharedModel != null)
+                            sharedModel.handleConnectionException(new Exception(t));
                     }
                 }
             } catch (Throwable t) {
diff --git a/network/src/main/java/io/bitsquare/p2p/storage/payload/MailboxStoragePayload.java b/network/src/main/java/io/bitsquare/p2p/storage/payload/MailboxStoragePayload.java
index fd0744e151..30651823e2 100644
--- a/network/src/main/java/io/bitsquare/p2p/storage/payload/MailboxStoragePayload.java
+++ b/network/src/main/java/io/bitsquare/p2p/storage/payload/MailboxStoragePayload.java
@@ -103,8 +103,8 @@ public final class MailboxStoragePayload implements StoragePayload {
     public String toString() {
         return "MailboxStoragePayload{" +
                 "prefixedSealedAndSignedMessage=" + prefixedSealedAndSignedMessage +
-                ", senderStoragePublicKey.hashCode()=" + senderPubKeyForAddOperation.hashCode() +
-                ", receiverStoragePublicKey.hashCode()=" + receiverPubKeyForRemoveOperation.hashCode() +
+                ", senderPubKeyForAddOperation.hashCode()=" + (senderPubKeyForAddOperation != null ? senderPubKeyForAddOperation.hashCode() : "null") +
+                ", receiverPubKeyForRemoveOperation.hashCode()=" + (receiverPubKeyForRemoveOperation != null ? receiverPubKeyForRemoveOperation.hashCode() : "null") +
                 '}';
     }
 }