diff --git a/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java b/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java
index 455c85dd12b..747d5d6925e 100644
--- a/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java
+++ b/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java
@@ -1474,7 +1474,9 @@ public class VmwareStorageProcessor implements StorageProcessor {
                         vmMo.destroy();
 
                         // this.hostService.handleDatastoreAndVmdkDetach(iScsiName, storageHost, storagePort);
-                        this.hostService.removeManagedTargetsFromCluster(managedIqns);
+                        if (managedIqns != null && !managedIqns.isEmpty()) {
+                            this.hostService.removeManagedTargetsFromCluster(managedIqns);
+                        }
 
                         for (NetworkDetails netDetails : networks) {
                             if (netDetails.getGCTag() != null && netDetails.getGCTag().equalsIgnoreCase("true")) {