2 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 791254cdf2..71c1e1b9a9 100644
--- a/actionpack/lib/action_dispatch/middleware/show_exceptions.rb
+++ b/actionpack/lib/action_dispatch/middleware/show_exceptions.rb
@@ -43,6 +43,8 @@ module ActionDispatch
     def call(env)
       @app.call(env)
     rescue Exception => exception
+      raise exception if env['rack.test']
+
       log_error(exception) if logger
 
       request = Request.new(env)
diff --git a/actionpack/lib/action_dispatch/middleware/stack.rb b/actionpack/lib/action_dispatch/middleware/stack.rb
index ec8a9ca76e..ade2d6f05e 100644
--- a/actionpack/lib/action_dispatch/middleware/stack.rb
+++ b/actionpack/lib/action_dispatch/middleware/stack.rb
@@ -34,8 +34,6 @@ module ActionDispatch
         else
           @klass.to_s.constantize
         end
-      rescue NameError
-        @klass
       end
 
       def active?