diff --git a/src/main/java/com/lbry/globe/thread/BlockchainNodeFinderThread.java b/src/main/java/com/lbry/globe/thread/BlockchainNodeFinderThread.java
index 16050e6..355dee9 100644
--- a/src/main/java/com/lbry/globe/thread/BlockchainNodeFinderThread.java
+++ b/src/main/java/com/lbry/globe/thread/BlockchainNodeFinderThread.java
@@ -77,7 +77,7 @@ public class BlockchainNodeFinderThread implements Runnable{
             Node existingNode = API.NODES.get(node.getKey());
             if(existingNode==null){
                 JSONObject geoData = GeoIP.getCachedGeoIPInformation(node.getKey());
-                Double[] coords = GeoIP.getCoordinateFromLocation(geoData.has("loc")?geoData.getString("loc"):null);
+                Double[] coords = GeoIP.getCoordinateFromLocation((geoData!=null && geoData.has("loc"))?geoData.getString("loc"):null);
                 existingNode = new Node(node.getKey(),coords[0],coords[1]);
                 API.NODES.put(node.getKey(),existingNode);
             }
diff --git a/src/main/java/com/lbry/globe/thread/DHTNodeFinderThread.java b/src/main/java/com/lbry/globe/thread/DHTNodeFinderThread.java
index c529cbc..9e2343c 100644
--- a/src/main/java/com/lbry/globe/thread/DHTNodeFinderThread.java
+++ b/src/main/java/com/lbry/globe/thread/DHTNodeFinderThread.java
@@ -110,7 +110,7 @@ public class DHTNodeFinderThread implements Runnable{
                         Node existingNode = API.NODES.get(receiverPacket.getAddress());
                         if(existingNode==null){
                             JSONObject geoData = GeoIP.getCachedGeoIPInformation(receiverPacket.getAddress());
-                            Double[] coords = GeoIP.getCoordinateFromLocation(geoData.has("loc")?geoData.getString("loc"):null);
+                            Double[] coords = GeoIP.getCoordinateFromLocation((geoData!=null && geoData.has("loc"))?geoData.getString("loc"):null);
                             existingNode = new Node(receiverPacket.getAddress(),coords[0],coords[1]);
                             API.NODES.put(receiverPacket.getAddress(),existingNode);
                         }
diff --git a/src/main/java/com/lbry/globe/thread/HubNodeFinderThread.java b/src/main/java/com/lbry/globe/thread/HubNodeFinderThread.java
index c7df1e7..5ccd156 100644
--- a/src/main/java/com/lbry/globe/thread/HubNodeFinderThread.java
+++ b/src/main/java/com/lbry/globe/thread/HubNodeFinderThread.java
@@ -103,7 +103,7 @@ public class HubNodeFinderThread implements Runnable{
                 Node existingNode = API.NODES.get(entry.getKey());
                 if(existingNode==null){
                     JSONObject geoData = GeoIP.getCachedGeoIPInformation(entry.getKey());
-                    Double[] coords = GeoIP.getCoordinateFromLocation(geoData.has("loc")?geoData.getString("loc"):null);
+                    Double[] coords = GeoIP.getCoordinateFromLocation((geoData!=null && geoData.has("loc"))?geoData.getString("loc"):null);
                     existingNode = new Node(entry.getKey(),coords[0],coords[1]);
                     API.NODES.put(entry.getKey(),existingNode);
                 }