diff --git a/packages/repo-tools/src/commands/package/schema/openapi/generate/client.ts b/packages/repo-tools/src/commands/package/schema/openapi/generate/client.ts
index 61be02979e..66f750bfc3 100644
--- a/packages/repo-tools/src/commands/package/schema/openapi/generate/client.ts
+++ b/packages/repo-tools/src/commands/package/schema/openapi/generate/client.ts
@@ -81,6 +81,8 @@ async function generate(
 
   await exec(
     `yarn backstage-cli package lint --fix ${resolvedOutputDirectory}`,
+    [],
+    { signal: abortSignal?.signal },
   );
 
   const prettier = cliPaths.resolveTargetRoot('node_modules/.bin/prettier');
@@ -115,7 +117,5 @@ export async function command(
     }
     console.log(chalk.red(`Client generation failed:`));
     console.log(err);
-
-    process.exit(1);
   }
 }
diff --git a/packages/repo-tools/src/commands/package/schema/openapi/generate/index.ts b/packages/repo-tools/src/commands/package/schema/openapi/generate/index.ts
index b10ae941d4..a7e9d9a402 100644
--- a/packages/repo-tools/src/commands/package/schema/openapi/generate/index.ts
+++ b/packages/repo-tools/src/commands/package/schema/openapi/generate/index.ts
@@ -19,6 +19,7 @@ import { command as generateClient } from './client';
 import { command as generateServer } from './server';
 import chokidar from 'chokidar';
 import { getPathToCurrentOpenApiSpec } from '../../../../../lib/openapi/helpers';
+import { debounce } from 'lodash';
 
 export async function command(opts: OptionValues) {
   if (!opts.clientPackage && !opts.server) {
@@ -50,11 +51,19 @@ export async function command(opts: OptionValues) {
       const resolvedOpenapiPath = await getPathToCurrentOpenApiSpec();
       let abortController = new AbortController();
       const watcher = chokidar.watch(resolvedOpenapiPath);
-      watcher.on('change', () => {
+
+      // The generate command currently takes ~8 seconds to run, so let's debounce calling it so we don't have to cancel it so much.
+      const debouncedCommand = debounce(() => {
         console.log('Detected changes! Regenerating...');
         abortController.abort();
         abortController = new AbortController();
-        sharedCommand(abortController);
+        sharedCommand(abortController).catch(err => {
+          console.error(chalk.red('Error: ', err));
+        });
+      }, 500);
+
+      watcher.on('change', () => {
+        debouncedCommand();
       });
       watcher.on('error', error => {
         console.error('Error happened', error);
@@ -64,7 +73,6 @@ export async function command(opts: OptionValues) {
         console.log(
           'Watching for changes in OpenAPI spec. Press Ctrl+C to stop.',
         );
-        await sharedCommand();
       });
       await new Promise(() => {});
     } catch (err) {
@@ -72,6 +80,10 @@ export async function command(opts: OptionValues) {
       process.exit(1);
     }
   } else {
-    await sharedCommand();
+    try {
+      await sharedCommand();
+    } catch (err) {
+      process.exit(1);
+    }
   }
 }
diff --git a/packages/repo-tools/src/commands/package/schema/openapi/generate/server.ts b/packages/repo-tools/src/commands/package/schema/openapi/generate/server.ts
index 317c17f96d..662efe4347 100644
--- a/packages/repo-tools/src/commands/package/schema/openapi/generate/server.ts
+++ b/packages/repo-tools/src/commands/package/schema/openapi/generate/server.ts
@@ -72,6 +72,5 @@ export async function command(abortSignal?: AbortController): Promise<void> {
     }
     console.log(chalk.red(`OpenAPI server stub generation failed.`));
     console.log(err.message);
-    process.exit(1);
   }
 }