Merge branch 'master' of github.com:rails/rails

1 files changed, 2 insertions, 2 deletions

diff --git a/actionpack/lib/action_dispatch/middleware/show_exceptions.rb b/actionpack/lib/action_dispatch/middleware/show_exceptions.rb
index 936fd548b9..dbe3206808 100644
--- a/actionpack/lib/action_dispatch/middleware/show_exceptions.rb
+++ b/actionpack/lib/action_dispatch/middleware/show_exceptions.rb
@@ -50,11 +50,11 @@ module ActionDispatch
         # Only this middleware cares about RoutingError. So, let's just raise
         # it here.
         if headers['X-Cascade'] == 'pass'
-           exception = ActionController::RoutingError.new("No route matches #{env['PATH_INFO'].inspect}")
+           raise ActionController::RoutingError, "No route matches #{env['PATH_INFO'].inspect}"
         end
       rescue Exception => exception
+        raise exception if env['action_dispatch.show_exceptions'] == false
       end
-      raise exception if env['action_dispatch.show_exceptions'] == false
 
       exception ? render_exception(env, exception) : [status, headers, body]
     end