diff --git a/lib/molinillo/resolution.rb b/lib/molinillo/resolution.rb
index bf4cb29..9bf2676 100644
--- a/lib/molinillo/resolution.rb
+++ b/lib/molinillo/resolution.rb
@@ -15,6 +15,8 @@ class Resolution
       # @attr [Array<Array<Object>>] requirement_trees the different requirement
       #   trees that led to every requirement for the conflicting name.
       # @attr [{String=>Object}] activated_by_name the already-activated specs.
+      # @attr [Object] underlying_error an error that has occurred during resolution, and
+      #    will be raised at the end of it if no resolution is found.
       Conflict = Struct.new(
         :requirement,
         :requirements,
@@ -23,7 +25,7 @@ class Resolution
         :locked_requirement,
         :requirement_trees,
         :activated_by_name,
-        :root_error
+        :underlying_error
       )
 
       class Conflict
@@ -180,16 +182,14 @@ def end_resolution
       # @return [void]
       def process_topmost_state
         if possibility
-          begin
-            attempt_to_activate
-          rescue CircularDependencyError => e
-            create_conflict(e)
-            unwind_for_conflict until possibility && state.is_a?(DependencyState)
-          end
+          attempt_to_activate
         else
-          create_conflict if state.is_a? PossibilityState
-          unwind_for_conflict until possibility && state.is_a?(DependencyState)
+          create_conflict
+          unwind_for_conflict
         end
+      rescue CircularDependencyError => underlying_error
+        create_conflict(underlying_error)
+        unwind_for_conflict
       end
 
       # @return [Object] the current possibility that the resolution is trying
@@ -236,11 +236,7 @@ def unwind_for_conflict
         debug(depth) { "Unwinding for conflict: #{requirement} to #{details_for_unwind.state_index / 2}" }
         conflicts.tap do |c|
           sliced_states = states.slice!((details_for_unwind.state_index + 1)..-1)
-          raise VersionConflict.new(c, specification_provider) unless state
-          unless state
-            error = c.values.map(&:root_error).detect {|e| ! e.nil? }
-            raise error || VersionConflict.new(c)
-          end
+          raise_error_unless_state(c)
           activated.rewind_to(sliced_states.first || :initial_state) if sliced_states
           state.conflicts = c
           filter_possibilities_after_unwind(details_for_unwind)
@@ -249,6 +245,16 @@ def unwind_for_conflict
         end
       end
 
+      # Raises a VersionConflict error, or any underlying error, if there is no
+      # current state
+      # @return [void]
+      def raise_error_unless_state(conflicts)
+        return if state
+
+        error = conflicts.values.map(&:underlying_error).compact.first
+        raise error || VersionConflict.new(conflicts, specification_provider)
+      end
+
       # @return [UnwindDetails] Details of the nearest index to which we could unwind
       def build_details_for_unwind
         # Process the current conflict first, as it's like to produce the highest
@@ -393,10 +399,20 @@ def filter_possibilities_for_parent_unwind(unwind_details)
       #    conflict to occur.
       def binding_requirements_for_conflict(conflict)
         return [conflict.requirement] if conflict.possibility.nil?
-        possibilities = search_for(conflict.requirement)
 
         possible_binding_requirements = conflict.requirements.values.flatten(1).uniq
 
+        # When there’s a `CircularDependency` error the conflicting requirement
+        # (the one causing the circular) won’t be `conflict.requirement`
+        # (which won’t be for the right state, because we won’t have created it,
+        # because it’s circular).
+        # We need to make sure we have that requirement in the conflict’s list,
+        # otherwise we won’t be able to unwind properly, so we just return all
+        # the requirements for the conflict.
+        return possible_binding_requirements if conflict.underlying_error
+
+        possibilities = search_for(conflict.requirement)
+
         # If all the requirements together don't filter out all possibilities,
         # then the only two requirements we need to consider are the initial one
         # (where the dependency's version was first chosen) and the last
@@ -463,7 +479,7 @@ def find_state_for(requirement)
 
       # @return [Conflict] a {Conflict} that reflects the failure to activate
       #   the {#possibility} in conjunction with the current {#state}
-      def create_conflict(root_error=nil)
+      def create_conflict(underlying_error = nil)
         vertex = activated.vertex_named(name)
         locked_requirement = locked_requirement_named(name)
 
@@ -486,7 +502,7 @@ def create_conflict(root_error=nil)
           locked_requirement,
           requirement_trees,
           activated_by_name,
-          root_error
+          underlying_error
         )
       end
 
diff --git a/spec/resolver_integration_specs b/spec/resolver_integration_specs
index 6646df7..8374485 160000
--- a/spec/resolver_integration_specs
+++ b/spec/resolver_integration_specs
@@ -1 +1 @@
-Subproject commit 6646df74cc66510eec8af0c27010f5b3cdab27c9
+Subproject commit 8374485c7973c41b9805aafd6ae4dd77c8a4034e