diff --git a/spec/kemal_handler_spec.cr b/spec/kemal_handler_spec.cr
index f2fc3db..9c69025 100644
--- a/spec/kemal_handler_spec.cr
+++ b/spec/kemal_handler_spec.cr
@@ -109,4 +109,15 @@ describe "Kemal::Handler" do
     response = kemal.call(request)
     response.status_code.should eq 404
   end
+
+  it "renders 500 on exception" do
+    kemal = Kemal::Handler.new
+    kemal.add_route "GET", "/" do
+      raise "Exception"
+    end
+    request = HTTP::Request.new("GET", "/?message=world")
+    response = kemal.call(request)
+    response.status_code.should eq 500
+    response.body.includes?("Exception").should eq true
+  end
 end
diff --git a/src/kemal/handler.cr b/src/kemal/handler.cr
index 81b265c..3becf36 100644
--- a/src/kemal/handler.cr
+++ b/src/kemal/handler.cr
@@ -33,7 +33,6 @@ class Kemal::Handler < HTTP::Handler
     end
     # Render 404 unless a route matches
     return render_404
-    nil
   end
 
   def render_404