diff --git a/api/src/com/cloud/agent/api/NetworkUsageAnswer.java b/api/src/com/cloud/agent/api/NetworkUsageAnswer.java
index 973bef08946..00b84ee29e5 100644
--- a/api/src/com/cloud/agent/api/NetworkUsageAnswer.java
+++ b/api/src/com/cloud/agent/api/NetworkUsageAnswer.java
@@ -34,6 +34,10 @@ public class NetworkUsageAnswer extends Answer {
         this.bytesSent = bytesSent;
         routerName = cmd.getDomRName();
     }
+    
+    public NetworkUsageAnswer(Command command, Exception e) {
+        super(command, e);
+    }
 
 
     public void setBytesReceived(Long bytesReceived) {
diff --git a/core/src/com/cloud/hypervisor/xen/resource/XenServer56Resource.java b/core/src/com/cloud/hypervisor/xen/resource/XenServer56Resource.java
index 02f08f02c5d..5295de76d90 100644
--- a/core/src/com/cloud/hypervisor/xen/resource/XenServer56Resource.java
+++ b/core/src/com/cloud/hypervisor/xen/resource/XenServer56Resource.java
@@ -169,15 +169,20 @@ public class XenServer56Resource extends CitrixResourceBase {
     }
 
     protected NetworkUsageAnswer execute(NetworkUsageCommand cmd) {
-        Connection conn = getConnection();
-        if(cmd.getOption()!=null && cmd.getOption().equals("create") ){
-            String result = networkUsage(conn, cmd.getPrivateIP(), "create", null);
-            NetworkUsageAnswer answer = new NetworkUsageAnswer(cmd, result, 0L, 0L);
+        try {
+            Connection conn = getConnection();
+            if(cmd.getOption()!=null && cmd.getOption().equals("create") ){
+                String result = networkUsage(conn, cmd.getPrivateIP(), "create", null);
+                NetworkUsageAnswer answer = new NetworkUsageAnswer(cmd, result, 0L, 0L);
+                return answer;
+            }
+            long[] stats = getNetworkStats(conn, cmd.getPrivateIP());
+            NetworkUsageAnswer answer = new NetworkUsageAnswer(cmd, "", stats[0], stats[1]);
             return answer;
+        } catch (Exception ex) {
+            s_logger.warn("Failed to get network usage stats due to ", ex);
+            return new NetworkUsageAnswer(cmd, ex); 
         }
-        long[] stats = getNetworkStats(conn, cmd.getPrivateIP());
-        NetworkUsageAnswer answer = new NetworkUsageAnswer(cmd, "", stats[0], stats[1]);
-        return answer;
     }
 
     @Override
diff --git a/core/src/com/cloud/hypervisor/xen/resource/XenServerConnectionPool.java b/core/src/com/cloud/hypervisor/xen/resource/XenServerConnectionPool.java
index d2124fc9f55..a9f7f61505d 100644
--- a/core/src/com/cloud/hypervisor/xen/resource/XenServerConnectionPool.java
+++ b/core/src/com/cloud/hypervisor/xen/resource/XenServerConnectionPool.java
@@ -667,11 +667,9 @@ public class XenServerConnectionPool {
                     } 
                     PoolEmergencyResetMaster(ipAddress, mConn.getIp(), mConn.getUsername(), mConn.getPassword());
                 } catch (Exception e) {
-                    String msg = "Master can not talk to Slave " + hostUuid + " IP " + ipAddress;
-                    if (s_logger.isDebugEnabled()) {
-                        s_logger.debug(msg);                           
-                    }
-                    throw new CloudRuntimeException(msg);
+                    String msg = "Echo test failed on host " + hostUuid + " IP " + ipAddress;
+                    s_logger.warn(msg, e);                           
+                    throw new CloudRuntimeException(msg, e);
                 }
             }
         }
diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
index f0a4ae690bb..e6a5f0249af 100755
--- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
+++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
@@ -806,7 +806,12 @@ public class VirtualNetworkApplianceManagerImpl implements VirtualNetworkApplian
                             s_logger.warn("Error while collecting network stats from router: "+router.getInstanceName()+" from host: "+router.getHostId(), e);
                             continue;
                         }
+                        
                         if (answer != null) {
+                            if (!answer.getResult()) {
+                                s_logger.warn("Error while collecting network stats from router: "+router.getInstanceName()+" from host: "+router.getHostId() + "; details: " + answer.getDetails());
+                                continue;
+                            }
                             Transaction txn = Transaction.open(Transaction.CLOUD_DB);
                             try {
                                 if ((answer.getBytesReceived() == 0) && (answer.getBytesSent() == 0)) {