diff --git a/pr-checks/checks/resolve-environment-action.yml b/pr-checks/checks/resolve-environment-action.yml
index 6202c06fe3..60116052fb 100644
--- a/pr-checks/checks/resolve-environment-action.yml
+++ b/pr-checks/checks/resolve-environment-action.yml
@@ -1,4 +1,4 @@
-name: "resolve-environment-action"
+name: "Resolve environment"
 description: "Tests that the resolve-environment action works for Go"
 versions: ["nightly-latest"]
 steps:
diff --git a/src/codeql.ts b/src/codeql.ts
index f3fbac4130..6ebe82e48c 100644
--- a/src/codeql.ts
+++ b/src/codeql.ts
@@ -239,7 +239,6 @@ export interface ResolveQueriesOutput {
 export interface ResolveBuildEnvironmentOutput {
   configuration?: {
     [language: string]: {
-      os?: unknown;
       [key: string]: unknown;
     };
   };
diff --git a/src/resolve-environment-action.ts b/src/resolve-environment-action.ts
index 47f808d4a4..35bd643277 100644
--- a/src/resolve-environment-action.ts
+++ b/src/resolve-environment-action.ts
@@ -58,11 +58,11 @@ async function run() {
     core.setOutput("environment", result);
   } catch (unwrappedError) {
     const error = wrapError(unwrappedError);
-    core.setFailed(error.message);
+    core.setFailed(`Failed to resolve a build environment suitable for automatically building your code. ${error.message}`);
     await sendStatusReport(
       await createStatusReportBase(
         ACTION_NAME,
-        "aborted",
+        getActionsStatus(error),
         startedAt,
         error.message,
         error.stack
diff --git a/src/resolve-environment.ts b/src/resolve-environment.ts
index ffe68a9652..2b342fcb8e 100644
--- a/src/resolve-environment.ts
+++ b/src/resolve-environment.ts
@@ -11,8 +11,8 @@ export async function runResolveBuildEnvironment(
   logger.startGroup(
     `Attempting to resolve build environment for ${language} in ${workingDir}`
   );
-  const codeQL = await getCodeQL(cmd);
-  const result = await codeQL.resolveBuildEnvironment(workingDir, language);
+  const codeql = await getCodeQL(cmd);
+  const result = await codeql.resolveBuildEnvironment(workingDir, language);
   logger.endGroup();
   return result;
 }