diff --git a/lib/upload-lib.js b/lib/upload-lib.js
index 07f330900..6c8100d58 100644
--- a/lib/upload-lib.js
+++ b/lib/upload-lib.js
@@ -109,6 +109,10 @@ async function upload(input) {
         const sarifFiles = fs.readdirSync(input)
             .filter(f => f.endsWith(".sarif"))
             .map(f => path.resolve(input, f));
+        if (sarifFiles.length === 0) {
+            core.setFailed("No SARIF files found to upload in \"" + input + "\".");
+            return false;
+        }
         return await uploadFiles(sarifFiles);
     }
     else {
@@ -135,7 +139,7 @@ async function uploadFiles(sarifFiles) {
         const ref = util.getRequiredEnvParam('GITHUB_REF'); // it's in the form "refs/heads/master"
         const analysisName = util.getRequiredEnvParam('GITHUB_WORKFLOW');
         const startedAt = process.env[sharedEnv.CODEQL_ACTION_STARTED_AT];
-        core.debug("Uploading sarif files: " + JSON.stringify(sarifFiles));
+        core.info("Uploading sarif files: " + JSON.stringify(sarifFiles));
         let sarifPayload = combineSarifFiles(sarifFiles);
         sarifPayload = fingerprints.addFingerprints(sarifPayload);
         const zipped_sarif = zlib_1.default.gzipSync(sarifPayload).toString('base64');
diff --git a/src/upload-lib.ts b/src/upload-lib.ts
index cb8476aa4..7eb44a635 100644
--- a/src/upload-lib.ts
+++ b/src/upload-lib.ts
@@ -112,6 +112,10 @@ export async function upload(input: string): Promise<boolean> {
         const sarifFiles = fs.readdirSync(input)
             .filter(f => f.endsWith(".sarif"))
             .map(f => path.resolve(input, f));
+        if (sarifFiles.length === 0) {
+            core.setFailed("No SARIF files found to upload in \"" + input + "\".");
+            return false;
+        }
         return await uploadFiles(sarifFiles);
     } else {
         return await uploadFiles([input]);
@@ -139,7 +143,7 @@ async function uploadFiles(sarifFiles: string[]): Promise<boolean> {
         const analysisName = util.getRequiredEnvParam('GITHUB_WORKFLOW');
         const startedAt = process.env[sharedEnv.CODEQL_ACTION_STARTED_AT];
 
-        core.debug("Uploading sarif files: " + JSON.stringify(sarifFiles));
+        core.info("Uploading sarif files: " + JSON.stringify(sarifFiles));
         let sarifPayload = combineSarifFiles(sarifFiles);
         sarifPayload = fingerprints.addFingerprints(sarifPayload);