From aff235dbb0f1af21cb5b13a99bdc38fbd3ae5ce8 Mon Sep 17 00:00:00 2001
From: Manfred Karrer <mk@nucleo.io>
Date: Wed, 19 Nov 2014 14:33:39 +0100
Subject: [PATCH] Add null check

---
 .../io/bitsquare/msg/tomp2p/TomP2PNode.java    | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/main/java/io/bitsquare/msg/tomp2p/TomP2PNode.java b/src/main/java/io/bitsquare/msg/tomp2p/TomP2PNode.java
index 7b10c3501b..1953a4fe91 100644
--- a/src/main/java/io/bitsquare/msg/tomp2p/TomP2PNode.java
+++ b/src/main/java/io/bitsquare/msg/tomp2p/TomP2PNode.java
@@ -323,14 +323,20 @@ public class TomP2PNode implements ClientNode {
         timer.scheduleAtFixedRate(new TimerTask() {
             @Override
             public void run() {
-                if (peerDHT != null && !storedPeerAddress.equals(peerDHT.peerAddress())) {
-                    try {
-                        storeAddress();
-                    } catch (IOException e) {
-                        e.printStackTrace();
-                        log.error(e.toString());
+                if (storedPeerAddress != null) {
+                    if (peerDHT != null && !storedPeerAddress.equals(peerDHT.peerAddress())) {
+                        try {
+                            storeAddress();
+                        } catch (IOException e) {
+                            e.printStackTrace();
+                            log.error(e.toString());
+                        }
                     }
                 }
+                else {
+                    log.error("storedPeerAddress is null. That should not happen. " +
+                            "Seems there is a problem with DHT storage.");
+                }
             }
         }, checkIfIPChangedPeriod, checkIfIPChangedPeriod);
     }