diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java
index c1b5dfa1e65..7d0c12a9433 100644
--- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java
+++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java
@@ -300,6 +300,11 @@ public class VMwareGuru extends HypervisorGuruBase implements HypervisorGuru {
     public Pair<Boolean, Long> getCommandHostDelegation(long hostId, Command cmd) {
         boolean needDelegation = false;
 
+        HostVO host = _hostDao.findById(hostId);
+        if (host.getHypervisorType() != HypervisorType.VMware) {
+            return new Pair<Boolean, Long>(Boolean.FALSE, new Long(hostId));
+        }
+
         if (cmd instanceof CopyCommand) {
             CopyCommand cpyCommand = (CopyCommand)cmd;
             DataTO srcData = cpyCommand.getSrcTO();
@@ -343,9 +348,7 @@ public class VMwareGuru extends HypervisorGuruBase implements HypervisorGuru {
             return new Pair<Boolean, Long>(Boolean.FALSE, new Long(hostId));
         }
 
-        HostVO host = _hostDao.findById(hostId);
         long dcId = host.getDataCenterId();
-
         Pair<HostVO, SecondaryStorageVmVO> cmdTarget = _secStorageMgr.assignSecStorageVm(dcId, cmd);
         if(cmdTarget != null) {
             // TODO, we need to make sure agent is actually connected too