diff --git a/src/vmm/VirtualMachineManager.cc b/src/vmm/VirtualMachineManager.cc
index e28e15b44f..729c53655a 100644
--- a/src/vmm/VirtualMachineManager.cc
+++ b/src/vmm/VirtualMachineManager.cc
@@ -830,12 +830,18 @@ void VirtualMachineManager::timer_action()
     {
         vm = vmpool->get(*it,true);
 
-        if ( vm == 0 || (!vm->hasHistory()))
+        if ( vm == 0 )
+        {
+            continue;
+        }
+
+        if (!vm->hasHistory())
         {
             os.str("");
             os << "Monitoring VM " << *it << " but it has no history.";
             NebulaLog::log("VMM", Log::ERROR, os);
 
+            vm->unlock();
             continue;
         }