diff --git a/api/src/com/cloud/agent/api/MaintainAnswer.java b/api/src/com/cloud/agent/api/MaintainAnswer.java
index 48ad96d3dd1..3c225b78f93 100644
--- a/api/src/com/cloud/agent/api/MaintainAnswer.java
+++ b/api/src/com/cloud/agent/api/MaintainAnswer.java
@@ -18,6 +18,8 @@
 package com.cloud.agent.api;
 
 public class MaintainAnswer extends Answer {
+	boolean willMigrate;
+	
     public MaintainAnswer() {
     }
     
@@ -25,11 +27,21 @@ public class MaintainAnswer extends Answer {
         this(cmd, true, null);
     }
     
+    public MaintainAnswer(MaintainCommand cmd, boolean willMigrate) {
+        this(cmd, true, null);
+        this.willMigrate = willMigrate;
+    }
+    
     public MaintainAnswer(MaintainCommand cmd, String details) {
         this(cmd, true, details);
     }
     
     public MaintainAnswer(MaintainCommand cmd, boolean result, String details) {
         super(cmd, result, details);
+        this.willMigrate = true;
+    }
+    
+    public boolean getMigrate() {
+    	return this.willMigrate;
     }
 }
diff --git a/server/src/com/cloud/agent/manager/AgentManagerImpl.java b/server/src/com/cloud/agent/manager/AgentManagerImpl.java
index d594114a168..81f0a620c40 100755
--- a/server/src/com/cloud/agent/manager/AgentManagerImpl.java
+++ b/server/src/com/cloud/agent/manager/AgentManagerImpl.java
@@ -49,6 +49,7 @@ import com.cloud.agent.api.CheckHealthCommand;
 import com.cloud.agent.api.Command;
 import com.cloud.agent.api.GetHostStatsAnswer;
 import com.cloud.agent.api.GetHostStatsCommand;
+import com.cloud.agent.api.MaintainAnswer;
 import com.cloud.agent.api.MaintainCommand;
 import com.cloud.agent.api.PingAnswer;
 import com.cloud.agent.api.PingCommand;
@@ -658,6 +659,14 @@ public class AgentManagerImpl implements AgentManager, HandlerFactory, Manager {
                     } catch (OperationTimedoutException e) {
                         s_logger.warn("Sending ShutdownCommand failed: ", e);
                     }
+                } else if (host.getHypervisorType() == HypervisorType.BareMetal) {
+                	List<VMInstanceVO> deadVms = _vmDao.listByLastHostId(hostId);
+                	for (VMInstanceVO vm : deadVms) {
+                		if (vm.getState() == State.Running || vm.getHostId() != null) {
+                			throw new CloudRuntimeException("VM " + vm.getId() + "is still running on host " + hostId);
+                		}
+                		_vmDao.remove(vm.getId());
+                	}
                 }
             }
 
@@ -1527,7 +1536,7 @@ public class AgentManagerImpl implements AgentManager, HandlerFactory, Manager {
         HostVO host = _hostDao.findById(hostId);
         Status state;
 
-        Answer answer = easySend(hostId, new MaintainCommand());
+        MaintainAnswer answer = (MaintainAnswer) easySend(hostId, new MaintainCommand());
         if (answer == null || !answer.getResult()) {
             s_logger.warn("Unable to put host in maintainance mode: " + hostId);
             return false;
@@ -1569,7 +1578,7 @@ public class AgentManagerImpl implements AgentManager, HandlerFactory, Manager {
             List<HostVO> hosts = _hostDao.listBy(host.getClusterId(), host.getPodId(), host.getDataCenterId());
 
             for (final VMInstanceVO vm : vms) {
-                if (hosts == null || hosts.size() <= 1) {
+                if (hosts == null || hosts.size() <= 1 || !answer.getMigrate()) {
                     // for the last host in this cluster, stop all the VMs
                     _haMgr.scheduleStop(vm, hostId, WorkType.ForceStop);
                 } else {