diff --git a/client/tomcatconf/components-premium.xml.in b/client/tomcatconf/components-premium.xml.in
index 82a903864c4..873a0d0601b 100755
--- a/client/tomcatconf/components-premium.xml.in
+++ b/client/tomcatconf/components-premium.xml.in
@@ -15,10 +15,12 @@
             <adapter name="XenServerInvestigator" class="com.cloud.ha.XenServerInvestigator"/>
             <adapter name="PingInvestigator" class="com.cloud.ha.UserVmDomRInvestigator"/>
 			<adapter name="ManagementIPSysVMInvestigator" class="com.cloud.ha.ManagementIPSystemVMInvestigator"/>
+            <adapter name="VmwareInvestigator" class="com.cloud.ha.VmwareInvestigator"/>
         </adapters>
         <adapters key="com.cloud.ha.FenceBuilder">
             <adapter name="XenServerFenceBuilder" class="com.cloud.ha.XenServerFencer"/>
             <adapter name="KVMFenceBuilder" class="com.cloud.ha.KVMFencer"/>
+            <adapter name="VmwareFenceBuilder" class="com.cloud.ha.VmwareFencer"/>
         </adapters>
         <adapters key="com.cloud.network.guru.NetworkGuru">
             <adapter name="ExternalGuestNetworkGuru" class="com.cloud.network.guru.ExternalGuestNetworkGuru"/>
diff --git a/core/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java b/core/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
index 1fc661b42f6..45a99643ac4 100755
--- a/core/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
+++ b/core/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
@@ -2614,7 +2614,9 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa
                         HostMO hostMo = vmMo.getRunningHost();
                         List<NetworkDetails> networks = vmMo.getNetworksWithDetails();
                         
-                        // tear down all devices first before we destroy the VM to avoid accidently delete disk backing files
+                        // tear down all devices first before we destroy the VM to avoid accidently delete disk backing files
+                        if (getVmState(vmMo) != State.Stopped)
+                        	vmMo.safePowerOff(_shutdown_waitMs);
                         vmMo.tearDownDevices(new Class<?>[] { VirtualDisk.class, VirtualEthernetCard.class });
                         vmMo.destroy();