diff --git a/server/src/com/cloud/resource/ResourceManagerImpl.java b/server/src/com/cloud/resource/ResourceManagerImpl.java
index a67a834edd0..c27b88f535f 100755
--- a/server/src/com/cloud/resource/ResourceManagerImpl.java
+++ b/server/src/com/cloud/resource/ResourceManagerImpl.java
@@ -415,7 +415,7 @@ public class ResourceManagerImpl implements ResourceManager, ResourceService, Ma
         clusterId = cluster.getId();
         result.add(cluster);
         
-        if (cmd.getAddVSMFlag().equalsIgnoreCase("true")) {
+        if (cmd.getAddVSMFlag() != null && cmd.getAddVSMFlag().equalsIgnoreCase("true")) {
 
         	String vsmIp = cmd.getVSMIpaddress();
         	String vsmUser = cmd.getVSMUsername();