github
diff --git a/‎lib/init.js
Lines changed: 11 additions & 5 deletions b/‎lib/init.js
Lines changed: 11 additions & 5 deletions
diff --git a/‎lib/init.js.map
Lines changed: 1 addition & 1 deletion b/‎lib/init.js.map
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/init.ts
Lines changed: 7 additions & 3 deletions b/‎src/init.ts
Lines changed: 7 additions & 3 deletions
@@ -117,9 +117,10 @@ export async function runInit(
       }
     }
   } catch (e) {
-    // Handle the situation where init is called twice
-    // for the same database in the same job.
+    // Check if we need to re-throw the error as a UserError in order to avoid
+    // counting this error towards our internal error budget.
     if (
+      // Init action called twice
       e instanceof Error &&
       e.message?.includes("Refusing to create databases") &&
       e.message.includes("exists and is not an empty directory.")
@@ -129,7 +130,10 @@ export async function runInit(
       );
     } else if (
       e instanceof Error &&
-      e.message?.includes("is not compatible with this CodeQL CLI")
+      // Version of CodeQL CLI is incompatible with this version of the CodeQL Action
+      (e.message?.includes("is not compatible with this CodeQL CLI") ||
+        // Expected source location for database creation does not exist
+        e.message?.includes("Invalid source root"))
     ) {
       throw new util.UserError(e.message);
     } else {