2 files changed, 7 insertions, 4 deletions
diff --git a/actionpack/lib/action_controller/metal/exceptions.rb b/actionpack/lib/action_controller/metal/exceptions.rb
index 8fd8f4797c..3c9d0c86a7 100644
--- a/actionpack/lib/action_controller/metal/exceptions.rb
+++ b/actionpack/lib/action_controller/metal/exceptions.rb
@@ -16,6 +16,9 @@ module ActionController
     end
   end
 
+  class ActionController::UrlGenerationError < RoutingError #:nodoc:
+  end
+
   class MethodNotAllowed < ActionControllerError #:nodoc:
     def initialize(*allowed_methods)
       super("Only #{allowed_methods.to_sentence(:locale => :en)} requests are allowed.")
diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb
index 32d267d1d6..bb1323c74e 100644
--- a/actionpack/lib/action_dispatch/routing/route_set.rb
+++ b/actionpack/lib/action_dispatch/routing/route_set.rb
@@ -534,12 +534,12 @@ module ActionDispatch
           return [path, params.keys] if @extras
 
           [path, params]
-        rescue Journey::Router::RoutingError
-          raise_routing_error
+        rescue Journey::Router::RoutingError => e
+          raise_routing_error(e.message)
         end
 
-        def raise_routing_error
-          raise ActionController::RoutingError, "No route matches #{options.inspect}"
+        def raise_routing_error(message)
+          raise ActionController::UrlGenerationError, "No route matches #{options.inspect} #{message}"
         end
 
         def different_controller?