diff --git a/lib/fog/rackspace/models/compute_v2/image.rb b/lib/fog/rackspace/models/compute_v2/image.rb
index f5fa5c707..72085e2ab 100644
--- a/lib/fog/rackspace/models/compute_v2/image.rb
+++ b/lib/fog/rackspace/models/compute_v2/image.rb
@@ -46,9 +46,14 @@ module Fog
           metadata.from_hash(hash)
         end
 
-        def ready?
-          state ==  ACTIVE
+        def ready?(ready_state = ACTIVE, error_states=[ERROR])
+          if error_states
+            error_states = Array(error_states)
+            raise "Image should have transitioned to '#{ready_state}' not '#{state}'" if error_states.include?(state)
+          end
+          state == ready_state
         end
+        
 
         def destroy
           requires :identity