0
@@ -738,7 +738,6 @@ module Sinatra
0
         end
0
         body = returned.to_result(context)
0
       rescue => e
0
-        raise e if options.raise_errors
0
         request.env['sinatra.error'] = e
0
         context.status(500)
0
         result = (errors[e.class] || errors[ServerError]).invoke(request)
0
@@ -763,7 +762,10 @@ module Sinatra
0
     
0
     def setup!
0
       configure do
0
-        error { '<h1>Internal Server Error</h1>'}
0
+        error do
0
+          raise request.env['sinatra.error'] if Sinatra.options.raise_errors
0
+          '<h1>Internal Server Error</h1>'
0
+        end
0
         not_found { '<h1>Not Found</h1>'}
0
       end
0
       

0
@@ -46,6 +46,18 @@ context "Custom Errors (in general)" do
0
     
0
     Sinatra.application.options.raise_errors = true
0
   end
0
+  
0
+  class UnmappedError < RuntimeError; end
0
+  
0
+  specify "should bring unmapped error back to the top" do
0
+    get '/' do
0
+      raise UnmappedError, 'test'
0
+    end
0
+    
0
+    assert_raises(UnmappedError) do
0
+      get_it '/'
0
+    end
0
+  end
0
 
0
 end
0
 

0
@@ -6,14 +6,8 @@ context "Mapped errors" do
0
   
0
   setup do
0
     Sinatra.application = nil
0
-    Sinatra.application.options.raise_errors = false
0
   end
0
   
0
-  teardown do
0
-    Sinatra.application.options.raise_errors = true
0
-  end
0
-  
0
-  
0
   specify "are rescued and run in context" do
0
     
0
     error FooError do