diff --git a/spec/common_exception_handler_spec.cr b/spec/common_exception_handler_spec.cr
new file mode 100644
index 0000000..3cb480f
--- /dev/null
+++ b/spec/common_exception_handler_spec.cr
@@ -0,0 +1,11 @@
+require "./spec_helper"
+
+describe "Kemal::CommonExceptionHandler" do
+  it "renders 404 on route not found" do
+    common_exception_handler = Kemal::CommonExceptionHandler::INSTANCE
+    request = HTTP::Request.new("GET", "/?message=world")
+    io_with_context = create_request_and_return_io(common_exception_handler, request)
+    client_response = HTTP::Client::Response.from_io(io_with_context, decompress: false)
+    client_response.status_code.should eq 404
+  end
+end
diff --git a/spec/route_handler_spec.cr b/spec/route_handler_spec.cr
index 6d21334..85c182e 100644
--- a/spec/route_handler_spec.cr
+++ b/spec/route_handler_spec.cr
@@ -108,27 +108,6 @@ describe "Kemal::RouteHandler" do
     client_response.body.should eq("Skills ruby,crystal")
   end
 
-  # Removed until there is a way to test multiple middlewares
-  # it "renders 404 on not found" do
-  #  kemal = Kemal::RouteHandler::INSTANCE
-  #  request = HTTP::Request.new("GET", "/?message=world")
-  #  io_with_context = create_request_and_return_io(kemal, request)
-  #  client_response = HTTP::Client::Response.from_io(io_with_context, decompress: false)
-  #  client_response.status_code.should eq 404
-  # end
-
-  # it "renders 500 on exception" do
-  #   kemal = Kemal::RouteHandler::INSTANCE
-  #   kemal.add_route "GET", "/" do
-  #     raise "Exception"
-  #   end
-  #   request = HTTP::Request.new("GET", "/?message=world")
-  #   io_with_context = create_request_and_return_io(kemal, request)
-  #   client_response = HTTP::Client::Response.from_io(io_with_context, decompress: false)
-  #   client_response.status_code.should eq 500
-  #   client_response.body.includes?("Exception").should eq true
-  # end
-  #
   it "checks for _method param in POST request to simulate PUT" do
     kemal = Kemal::RouteHandler::INSTANCE
     kemal.add_route "PUT", "/" do |env|
diff --git a/src/kemal/common_error_handler.cr b/src/kemal/common_exception_handler.cr
similarity index 76%
rename from src/kemal/common_error_handler.cr
rename to src/kemal/common_exception_handler.cr
index c12081c..a6ecaf8 100644
--- a/src/kemal/common_error_handler.cr
+++ b/src/kemal/common_exception_handler.cr
@@ -1,13 +1,15 @@
-class Kemal::CommonErrorHandler < HTTP::Handler
+class Kemal::CommonExceptionHandler < HTTP::Handler
   INSTANCE = new
 
   def call(context)
     begin
       call_next context
     rescue ex : Kemal::Exceptions::RouteNotFound
+      context.response.content_type = "text/html"
       Kemal.config.logger.write("Exception: #{ex.inspect_with_backtrace.colorize(:red)}\n")
       return render_404(context)
     rescue ex
+      context.response.content_type = "text/html"
       Kemal.config.logger.write("Exception: #{ex.inspect_with_backtrace.colorize(:red)}\n")
       verbosity = Kemal.config.env == "production" ? false : true
       return render_500(context, ex.inspect_with_backtrace, verbosity)
diff --git a/src/kemal/config.cr b/src/kemal/config.cr
index 6b8ee93..83da0d6 100644
--- a/src/kemal/config.cr
+++ b/src/kemal/config.cr
@@ -57,7 +57,7 @@ module Kemal
 
     private def setup_error_handler
       if @always_rescue
-        @error_handler ||= Kemal::CommonErrorHandler::INSTANCE
+        @error_handler ||= Kemal::CommonExceptionHandler::INSTANCE
         HANDLERS.insert(1, @error_handler.not_nil!)
       end
     end
diff --git a/src/kemal/view.cr b/src/kemal/view.cr
index c677a8c..b8ceb6c 100644
--- a/src/kemal/view.cr
+++ b/src/kemal/view.cr
@@ -17,6 +17,7 @@ def render_403(context)
       </body>
       </html>
   HTML
+  context.response.content_type = "text/html"
   context.response.status_code = 403
   context.response.print template
   context
@@ -40,6 +41,7 @@ def render_404(context)
       </body>
       </html>
   HTML
+  context.response.content_type = "text/html"
   context.response.status_code = 404
   context.response.print template
   context
@@ -72,6 +74,7 @@ def render_500(context, backtrace, verbosity)
       </body>
       </html>
   HTML
+  context.response.content_type = "text/html"
   context.response.status_code = 500
   context.response.print template
   context
@@ -96,6 +99,7 @@ def render_415(context, message)
           </body>
           </html>
       HTML
+  context.response.content_type = "text/html"
   context.response.status_code = 415
   context.response.print template
   context
@@ -120,6 +124,7 @@ def render_400(context, message)
           </body>
           </html>
       HTML
+  context.response.content_type = "text/html"
   context.response.status_code = 400
   context.response.print template
   context