diff --git a/vmware-host-pooler b/vmware-host-pooler
index fdf9e6a..e4352dd 100755
--- a/vmware-host-pooler
+++ b/vmware-host-pooler
@@ -73,7 +73,7 @@ loop do
         begin
           Socket.getaddrinfo(vm, nil)
         rescue
-          break
+          next
         end
 
         $redis.sadd('vmware_host_pool__ready__'+pool['name'], vm)
@@ -92,6 +92,7 @@ loop do
       if (
         (! vsphere_helper.find_vms(vm)[vm]) or
         (vsphere_helper.find_vms(vm)[vm].summary.guest.toolsRunningStatus != 'guestToolsRunning') or
+        (vsphere_helper.find_vms(vm)[vm].summary.guest.hostName != vm) or
         (vsphere_helper.find_vms(vm)[vm].summary.guest.ipAddress == nil)
       )
         $redis.srem('vmware_host_pool__ready__'+pool['name'], vm)
@@ -99,7 +100,7 @@ loop do
 
         logger.log('s', "[<] '#{vm}' moved to 'failed' queue")
 
-        break
+        next
       end
 
       begin
@@ -152,7 +153,7 @@ loop do
         begin
           Socket.getaddrinfo(vm, nil)
         rescue
-          break
+          next
         end
 
         $redis.sadd('vmware_host_pool__ready__'+pool['name'], vm)