diff --git a/app/controllers/concerns/scim_rails/exception_handler.rb b/app/controllers/concerns/scim_rails/exception_handler.rb
index 6d2eba2..7f780dc 100644
--- a/app/controllers/concerns/scim_rails/exception_handler.rb
+++ b/app/controllers/concerns/scim_rails/exception_handler.rb
@@ -68,6 +68,20 @@ module ScimRails
           )
         end
       end
+
+      ## StandardError must be ordered last or it will catch all exceptions
+      if Rails.env.production?
+        rescue_from StandardError do |e|
+          json_response(
+            {
+              schemas: ["urn:ietf:params:scim:api:messages:2.0:Error"],
+              detail: e.message,
+              status: "500"
+            },
+            :internal_server_error
+          )
+        end
+      end
     end
   end
 end
--
libgit2 0.21.0