diff --git a/src/java/voldemort/cluster/failuredetector/AbstractFailureDetector.java b/src/java/voldemort/cluster/failuredetector/AbstractFailureDetector.java
index <HASH>..<HASH> 100644
--- a/src/java/voldemort/cluster/failuredetector/AbstractFailureDetector.java
+++ b/src/java/voldemort/cluster/failuredetector/AbstractFailureDetector.java
@@ -216,8 +216,8 @@ public abstract class AbstractFailureDetector implements FailureDetector {
 
         if(nodeStatus == null) {
             logger.warn("creating new node status for node " + node + " for failure detector.");
-            nodeStatusMap.put(node, createNodeStatus(node, failureDetectorConfig.getTime()
-                                                                                .getMilliseconds()));
+            nodeStatus = createNodeStatus(node, failureDetectorConfig.getTime().getMilliseconds());
+            nodeStatusMap.put(node, nodeStatus);
         }
 
         return nodeStatus;
Returning the new NodeStatus() object if previous nodeStatus was null.