diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index c0de4f38..3083b5cf 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -3,11 +3,9 @@ class ApplicationController < ActionController::Base
 
   protected
 
-  unless Rails.env.development? || Rails.env.test?
-    rescue_from Exception, :with => :render_error
+  rescue_from Exception, :with => :render_error
 
-    def render_error
-      render :template => "/admin/errors/500", :layout => 'admin/box', :status => 500
-    end
+  def render_error
+    render :template => "/admin/errors/500", :layout => 'admin/box', :status => 500
   end
 end
diff --git a/config/environments/development.rb b/config/environments/development.rb
index a0d99d89..4cb91c0a 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -10,7 +10,7 @@ Locomotive::Application.configure do
   config.whiny_nils = true
 
   # Show full error reports and disable caching
-  config.consider_all_requests_local       = false
+  config.consider_all_requests_local       = true
   config.action_view.debug_rjs             = true
   config.action_controller.perform_caching = false