diff --git a/graphenej/src/main/java/cy/agorise/graphenej/network/FullNode.java b/graphenej/src/main/java/cy/agorise/graphenej/network/FullNode.java
index e98b9f1..0a80398 100644
--- a/graphenej/src/main/java/cy/agorise/graphenej/network/FullNode.java
+++ b/graphenej/src/main/java/cy/agorise/graphenej/network/FullNode.java
@@ -65,10 +65,16 @@ public class FullNode implements Comparable {
 
     /**
      *
-     * @return  The latest latency average value
+     * @return  The latest latency average value. If no measurement has been taken yet, the
+     * maximum allows value of a long primitive, or 2<sup>63</sup>-1 will be returned.
      */
     public double getLatencyValue() {
-        return mLatency.getAverage();
+        double average = mLatency.getAverage();
+        if(average == 0){
+            return Long.MAX_VALUE;
+        }else{
+            return average;
+        }
     }
 
     public boolean isConnected() {
diff --git a/graphenej/src/main/java/cy/agorise/graphenej/network/NodeLatencyVerifier.java b/graphenej/src/main/java/cy/agorise/graphenej/network/NodeLatencyVerifier.java
index a143d3c..18c63dc 100644
--- a/graphenej/src/main/java/cy/agorise/graphenej/network/NodeLatencyVerifier.java
+++ b/graphenej/src/main/java/cy/agorise/graphenej/network/NodeLatencyVerifier.java
@@ -35,8 +35,6 @@ public class NodeLatencyVerifier {
 
     private HashMap<HttpUrl, FullNode> nodeURLMap = new HashMap<>();
 
-//    private WebSocket webSocket;
-
     // Map used to store the first timestamp required for a RTT (Round Trip Time) measurement.
     // If:
     //      RTT = t2 - t1