diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/workspace-query-runner.service.ts b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/workspace-query-runner.service.ts
index 8fbee2a95..ef565b76f 100644
--- a/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/workspace-query-runner.service.ts
+++ b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/workspace-query-runner.service.ts
@@ -244,7 +244,7 @@ export class WorkspaceQueryRunnerService {
     assertMutationNotOnRemoteObject(objectMetadataItem);
 
     args.data.forEach((record) => {
-      if (record.id) {
+      if (record?.id) {
         assertIsValidUuid(record.id);
       }
     });
diff --git a/packages/twenty-server/src/engine/integrations/exception-handler/hooks/use-exception-handler.hook.ts b/packages/twenty-server/src/engine/integrations/exception-handler/hooks/use-exception-handler.hook.ts
index c358bc391..3e72c9504 100644
--- a/packages/twenty-server/src/engine/integrations/exception-handler/hooks/use-exception-handler.hook.ts
+++ b/packages/twenty-server/src/engine/integrations/exception-handler/hooks/use-exception-handler.hook.ts
@@ -106,12 +106,11 @@ export const useExceptionHandler = <PluginContext extends GraphQLContext>(
                 ...exceptions.unfiltered,
               ];
               const errors = concatenatedErrors.map((err) => {
-                // Properly convert errors to GraphQLErrors
-                const graphQLError = convertExceptionToGraphQLError(
-                  err.originalError,
-                );
+                if (!err.originalError) {
+                  return err;
+                }
 
-                return graphQLError;
+                return convertExceptionToGraphQLError(err.originalError);
               });
 
               setResult({