diff --git a/server/src/main/java/com/cloud/resource/ResourceManagerImpl.java b/server/src/main/java/com/cloud/resource/ResourceManagerImpl.java
index 69b80d10c01..8a93ec8fe44 100755
--- a/server/src/main/java/com/cloud/resource/ResourceManagerImpl.java
+++ b/server/src/main/java/com/cloud/resource/ResourceManagerImpl.java
@@ -2390,9 +2390,9 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager,
             _hostDao.update(host.getId(), host);
         }
 
-        if (startup instanceof StartupRoutingCommand) {
+        if (host != null && host.getHypervisorType().equals(HypervisorType.XenServer) &&
+                startup instanceof StartupRoutingCommand) {
             final StartupRoutingCommand ssCmd = (StartupRoutingCommand)startup;
-
             updateSupportsClonedVolumes(host, ssCmd.getSupportsClonedVolumes());
         }