git.diff

diff --git a/app/controllers/graphql_controller.rb b/app/controllers/graphql_controller.rb
index 2e300fc0..02592ea2 100644
--- a/app/controllers/graphql_controller.rb
+++ b/app/controllers/graphql_controller.rb
@@ -9,6 +9,15 @@ def execute
     }
     result = HermanoGraphQL.schema.execute(query, variables: variables, context: context, operation_name: operation_name)
     render json: result
+  rescue StandardError => e
+    e = e.cause while e.cause
+    render status: 200, json: {
+      errors: [{
+        name: e.class.name,
+        message: e.message,
+        time_thrown: Time.now.utc.iso8601
+      }]
+    }
   end
 
   def heartbeat