diff --git a/server/src/com/cloud/agent/manager/DirectAgentAttache.java b/server/src/com/cloud/agent/manager/DirectAgentAttache.java
index cafa42b9306..cb7fcfbc147 100644
--- a/server/src/com/cloud/agent/manager/DirectAgentAttache.java
+++ b/server/src/com/cloud/agent/manager/DirectAgentAttache.java
@@ -125,11 +125,11 @@ public class DirectAgentAttache extends AgentAttache {
 	        try {
 	            ServerResource resource = _resource;
 	            
-	            if (resource.IsRemoteAgent()) {
-	            	return;
-	            }
-	            
-	            if (resource != null) {
+                if (resource != null) {
+                    if (resource.IsRemoteAgent()) {
+                        return;
+                    }
+
         	        PingCommand cmd = resource.getCurrentStatus(_id);
         	        if (cmd == null) {
         	            s_logger.warn("Unable to get current status on " + _id);