diff --git a/actionpack/lib/action_controller/metal/exceptions.rb b/actionpack/lib/action_controller/metal/exceptions.rb
index 3844dbf2a6d762b307dd3625636f16af955d6356..18e003741dd062a5e868fe883a17a642898e024d 100644
--- a/actionpack/lib/action_controller/metal/exceptions.rb
+++ b/actionpack/lib/action_controller/metal/exceptions.rb
@@ -25,7 +25,7 @@ def initialize(message, failures=[])
     end
   end
 
-  class ActionController::UrlGenerationError < RoutingError #:nodoc:
+  class ActionController::UrlGenerationError < ActionControllerError #:nodoc:
   end
 
   class MethodNotAllowed < ActionControllerError #:nodoc:
diff --git a/railties/test/application/middleware/exceptions_test.rb b/railties/test/application/middleware/exceptions_test.rb
index 42096cfec49eccc0a9c71431a00c6ba88c7de319..a7472b37f152f3988fbcc5a70acd16bd84529d44 100644
--- a/railties/test/application/middleware/exceptions_test.rb
+++ b/railties/test/application/middleware/exceptions_test.rb
@@ -60,6 +60,21 @@ def index
       assert_equal "YOU FAILED BRO", last_response.body
     end
 
+    test "url generation error when action_dispatch.show_exceptions is set raises an exception" do
+      controller :foo, <<-RUBY
+        class FooController < ActionController::Base
+          def index
+            raise ActionController::UrlGenerationError
+          end
+        end
+      RUBY
+      
+      app.config.action_dispatch.show_exceptions = true
+
+      get '/foo'
+      assert_equal 500, last_response.status
+    end
+
     test "unspecified route when action_dispatch.show_exceptions is not set raises an exception" do
       app.config.action_dispatch.show_exceptions = false