diff --git a/lib/error-matcher.js b/lib/error-matcher.js
index 5d13441d1..7809fc58f 100644
--- a/lib/error-matcher.js
+++ b/lib/error-matcher.js
@@ -11,6 +11,16 @@ exports.namedMatchersForTesting = {
         message: "No code found during the build. Please see:\n" +
             "https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/troubleshooting-code-scanning#no-code-found-during-the-build",
     },
+    queryTimeout: {
+        exitCode: 33,
+        message: "One or more query evaluations timed out. Please see:\n" +
+            "Not sure if there's a good place to currently send people?",
+    },
+    outOfMemory: {
+        exitCode: 99,
+        message: "The CodeQL CLI ran out of memory. Please see:\n" +
+            "https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/troubleshooting-code-scanning#error-out-of-disk-or-out-of-memory",
+    },
 };
 // we collapse the matches into an array for use in execErrorCatcher
 exports.errorMatchers = Object.values(exports.namedMatchersForTesting);
diff --git a/lib/error-matcher.js.map b/lib/error-matcher.js.map
index 48bd956af..a00534c3c 100644
--- a/lib/error-matcher.js.map
+++ b/lib/error-matcher.js.map
@@ -1 +1 @@
-{"version":3,"file":"error-matcher.js","sourceRoot":"","sources":["../src/error-matcher.ts"],"names":[],"mappings":";;AAQA,qCAAqC;AACxB,QAAA,uBAAuB,GAAoC;IACtE;;MAEE;IACF,iBAAiB,EAAE;QACjB,QAAQ,EAAE,EAAE;QACZ,WAAW,EAAE,IAAI,MAAM,CAAC,2CAA2C,CAAC;QACpE,OAAO,EACL,+CAA+C;YAC/C,yJAAyJ;KAC5J;CACF,CAAC;AAEF,oEAAoE;AACvD,QAAA,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC,+BAAuB,CAAC,CAAC"}
\ No newline at end of file
+{"version":3,"file":"error-matcher.js","sourceRoot":"","sources":["../src/error-matcher.ts"],"names":[],"mappings":";;AAQA,qCAAqC;AACxB,QAAA,uBAAuB,GAAoC;IACtE;;MAEE;IACF,iBAAiB,EAAE;QACjB,QAAQ,EAAE,EAAE;QACZ,WAAW,EAAE,IAAI,MAAM,CAAC,2CAA2C,CAAC;QACpE,OAAO,EACL,+CAA+C;YAC/C,yJAAyJ;KAC5J;IAED,YAAY,EAAE;QACZ,QAAQ,EAAE,EAAE;QACZ,OAAO,EACL,wDAAwD;YACxD,4DAA4D;KAC/D;IAED,WAAW,EAAE;QACX,QAAQ,EAAE,EAAE;QACZ,OAAO,EACL,iDAAiD;YACjD,6JAA6J;KAChK;CACF,CAAC;AAEF,oEAAoE;AACvD,QAAA,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC,+BAAuB,CAAC,CAAC"}
\ No newline at end of file
diff --git a/src/error-matcher.ts b/src/error-matcher.ts
index ebbc5484d..9dd1c5da9 100644
--- a/src/error-matcher.ts
+++ b/src/error-matcher.ts
@@ -18,6 +18,20 @@ export const namedMatchersForTesting: { [key: string]: ErrorMatcher } = {
       "No code found during the build. Please see:\n" +
       "https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/troubleshooting-code-scanning#no-code-found-during-the-build",
   },
+
+  queryTimeout: {
+    exitCode: 33,
+    message:
+      "One or more query evaluations timed out. Please see:\n" +
+      "Not sure if there's a good place to currently send people?", // TODO find where we should send people for this error.
+  },
+
+  outOfMemory: {
+    exitCode: 99,
+    message:
+      "The CodeQL CLI ran out of memory. Please see:\n" +
+      "https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/troubleshooting-code-scanning#error-out-of-disk-or-out-of-memory",
+  },
 };
 
 // we collapse the matches into an array for use in execErrorCatcher