Prefer Rack::ErrorHandler middleware.

lib/rack/bad_request.rb

@@ -1,15 +1,4 @@
 module Rack
-	module BadRequest
-		class Middleware
-			def initialize(app)
-				@app = app
-			end
-
-			def call(env)
-				@app.call(env)
-			rescue BadRequest => error
-				[400, {}, ["Bad Request: #{error.message}"]]
-			end
-		end
-	end
+  module BadRequest
+  end
 end

lib/rack/error_handler.rb

@@ -0,0 +1,23 @@
+module Rack
+  class ErrorHandler
+    def initialize(app)
+      @app = app
+    end
+
+    def bad_request(error)
+      [400, {}, ["Bad Request: #{error.message}"]]
+    end
+
+    def internal_server_error(error)
+      [500, {}, ["Internal Server Error: #{error.message}"]]
+    end
+
+    def call(env)
+      @app.call(env)
+    rescue BadRequest => error
+      return bad_request(error)
+    rescue => error
+      return internal_server_error(error)
+    end
+  end
+end