diff --git a/core/src/com/cloud/agent/api/CheckS2SVpnConnectionsAnswer.java b/core/src/com/cloud/agent/api/CheckS2SVpnConnectionsAnswer.java
index 3ee5eac3a78..50dfaf202f9 100644
--- a/core/src/com/cloud/agent/api/CheckS2SVpnConnectionsAnswer.java
+++ b/core/src/com/cloud/agent/api/CheckS2SVpnConnectionsAnswer.java
@@ -60,7 +60,12 @@ public class CheckS2SVpnConnectionsAnswer extends Answer {
 
     public boolean isConnected(String ip) {
         if (this.getResult()) {
-            return ipToConnected.get(ip);
+            Boolean status = ipToConnected.get(ip);
+
+            if (status != null) {
+                return status;
+            }
+
         }
         return false;
     }