diff --git a/server/src/com/cloud/template/TemplateManagerImpl.java b/server/src/com/cloud/template/TemplateManagerImpl.java
index 262e8bc9c5e..0413e9c0377 100755
--- a/server/src/com/cloud/template/TemplateManagerImpl.java
+++ b/server/src/com/cloud/template/TemplateManagerImpl.java
@@ -819,6 +819,9 @@ public class TemplateManagerImpl implements TemplateManager, Manager, TemplateSe
         	throw new InvalidParameterValueException("Cannot attach Xenserver PV drivers to incompatible hypervisor " + vm.getHypervisorType());
         }
         
+        if("vmware-tools.iso".equals(iso.getName()) && vm.getHypervisorType() != Hypervisor.HypervisorType.VMware) {
+        	throw new InvalidParameterValueException("Cannot attach VMware tools drivers to incompatible hypervisor " + vm.getHypervisorType());
+        }
         return attachISOToVM(vmId, userId, isoId, true);
 	}
 
diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java
index 067b638cdfd..195627f5a4b 100755
--- a/server/src/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/com/cloud/vm/UserVmManagerImpl.java
@@ -861,7 +861,8 @@ public class UserVmManagerImpl implements UserVmManager, UserVmService, Manager
             cmd.setStoreUrl(isoPathPair.second());
         }
         Answer a = _agentMgr.easySend(vm.getHostId(), cmd);
-        return (a != null);
+        
+        return (a != null && a.getResult());
     }
 
     private UserVm rebootVirtualMachine(long userId, long vmId) throws InsufficientCapacityException, ResourceUnavailableException {