diff --git a/features/docs/defining_steps/ambiguous_steps.feature b/features/docs/defining_steps/ambiguous_steps.feature
index 8606f54577..24db6a1500 100644
--- a/features/docs/defining_steps/ambiguous_steps.feature
+++ b/features/docs/defining_steps/ambiguous_steps.feature
@@ -40,14 +40,14 @@ Feature: Ambiguous Steps
           features/step_definitions.rb:5:in `/^an ambiguous step$/'
           
           You can run again with --guess to make Cucumber be more smart about it
-           (Cucumber::Ambiguous)
+           (Cucumber::Core::Test::Result::Ambiguous)
           features/ambiguous.feature:5:in `Then an ambiguous step'
 
-    Failing Scenarios:
+    Ambiguous Scenarios:
     cucumber features/ambiguous.feature:3 # Scenario: 
 
-    1 scenario (1 failed)
-    2 steps (1 failed, 1 passed)
+    1 scenario (1 ambiguous)
+    2 steps (1 ambiguous, 1 passed)
     0m0.012s
 
     """
diff --git a/lib/cucumber/step_match.rb b/lib/cucumber/step_match.rb
index f2397dc861..da751ffe95 100644
--- a/lib/cucumber/step_match.rb
+++ b/lib/cucumber/step_match.rb
@@ -148,7 +148,7 @@ def initialize(error)
     end
 
     def activate(test_step)
-      return test_step.with_action { raise @error }
+      return test_step.with_action { raise Core::Test::Result::Ambiguous.new(@error.message) }
     end
 
   end