diff --git a/lib/ironfan/provider/openstack/machine.rb b/lib/ironfan/provider/openstack/machine.rb
index 67ae8a8c..857c1363 100644
--- a/lib/ironfan/provider/openstack/machine.rb
+++ b/lib/ironfan/provider/openstack/machine.rb
@@ -88,14 +88,19 @@ def running?
         def stopping?
           state == "stopping"
         end
+
         def stopped?
           state == "SHUTOFF"
         end
+        
+        def error?
+          state == "ERROR"
+        end
 
         def start
           machine = self
           adaptee.start
-          adaptee.wait_for{ machine.pending? or machine.running? }
+          adaptee.wait_for{ machine.pending? or machine.running? or machine.error? }
         end
 
         def stop