2 files changed, 11 insertions, 14 deletions
diff --git a/actionpack/lib/action_dispatch/http/request.rb b/actionpack/lib/action_dispatch/http/request.rb
index fc8825d6d9..18cf5b2bb0 100644
--- a/actionpack/lib/action_dispatch/http/request.rb
+++ b/actionpack/lib/action_dispatch/http/request.rb
@@ -251,21 +251,17 @@ module ActionDispatch
 
     # Override Rack's GET method to support indifferent access
     def GET
-      begin
-        @env["action_dispatch.request.query_parameters"] ||= (normalize_parameters(super) || {})
-      rescue TypeError => e
-        raise ActionController::BadRequest, "Invalid query parameters: #{e.message}"
-      end
+      @env["action_dispatch.request.query_parameters"] ||= (normalize_parameters(super) || {})
+    rescue TypeError => e
+      raise ActionController::BadRequest, "Invalid query parameters: #{e.message}", e.backtrace
     end
     alias :query_parameters :GET
 
     # Override Rack's POST method to support indifferent access
     def POST
-      begin
-        @env["action_dispatch.request.request_parameters"] ||= (normalize_parameters(super) || {})
-      rescue TypeError => e
-        raise ActionController::BadRequest, "Invalid request parameters: #{e.message}"
-      end
+      @env["action_dispatch.request.request_parameters"] ||= (normalize_parameters(super) || {})
+    rescue TypeError => e
+      raise ActionController::BadRequest, "Invalid request parameters: #{e.message}", e.backtrace
     end
     alias :request_parameters :POST
 
diff --git a/actionpack/test/dispatch/request_test.rb b/actionpack/test/dispatch/request_test.rb
index a2b9571660..26db91c741 100644
--- a/actionpack/test/dispatch/request_test.rb
+++ b/actionpack/test/dispatch/request_test.rb
@@ -550,12 +550,13 @@ class RequestTest < ActiveSupport::TestCase
   test "parameters still accessible after rack parse error" do
     mock_rack_env = { "QUERY_STRING" => "x[y]=1&x[y][][w]=2", "rack.input" => "foo" }
     request = nil
-    begin
-      request = stub_request(mock_rack_env)
-      request.parameters
-    rescue ActionController::BadRequest
+    request = stub_request(mock_rack_env)
+
+    assert_raises(ActionController::BadRequest) do
       # rack will raise a TypeError when parsing this query string
+      request.parameters
     end
+
     assert_equal({}, request.parameters)
   end