diff --git a/lib/entry-points.js b/lib/entry-points.js
index ed83519d0..fb6a8b6e2 100644
--- a/lib/entry-points.js
+++ b/lib/entry-points.js
@@ -146398,7 +146398,7 @@ var persistInputs = function(env = getEnv()) {
   );
   core3.saveState(persistedInputsKey, JSON.stringify(inputEnvironmentVariables));
 };
-var restoreInputs = function() {
+function restoreInputs(logger) {
   try {
     const persistedInputsValue = core3.getState(persistedInputsKey);
     if (persistedInputsValue) {
@@ -146408,9 +146408,12 @@ var restoreInputs = function() {
       }
     }
   } catch (err) {
-    throw new Error(`Unable to restore inputs: ${getErrorMessage(err)}`);
+    logger.error(`Unable to restore inputs: ${getErrorMessage(err)}`);
+    throw new Error(
+      "Failed to restore inputs from the state set by this action's main execution."
+    );
   }
-};
+}
 function getPullRequestBranches(env = getEnv()) {
   const pullRequest = github.context.payload.pull_request;
   if (pullRequest) {
@@ -161729,8 +161732,8 @@ async function createDatabaseBundleCli(codeql, config, language) {
 // src/analyze-action-post.ts
 async function runWrapper2() {
   try {
-    restoreInputs();
     const logger = getActionsLogger();
+    restoreInputs(logger);
     const gitHubVersion = await getGitHubVersion();
     checkGitHubVersionInRange(gitHubVersion, logger);
     if (process.env["CODEQL_ACTION_INIT_HAS_RUN" /* INIT_ACTION_HAS_RUN */] === "true") {
@@ -163026,7 +163029,7 @@ async function run4(startedAt) {
   let dependencyCachingUsage;
   try {
     const jobStatus2 = getOptionalInput("job-status");
-    restoreInputs();
+    restoreInputs(logger);
     const gitHubVersion = await getGitHubVersion();
     checkGitHubVersionInRange(gitHubVersion, logger);
     const repositoryNwo = getRepositoryNwo();
@@ -164177,7 +164180,7 @@ var core29 = __toESM(require_core());
 async function runWrapper9() {
   const logger = getActionsLogger();
   try {
-    restoreInputs();
+    restoreInputs(logger);
     const pid = core29.getState("proxy-process-pid");
     if (pid) {
       process.kill(Number(pid));
@@ -164328,8 +164331,8 @@ async function runWrapper10() {
 var core31 = __toESM(require_core());
 async function runWrapper11() {
   try {
-    restoreInputs();
     const logger = getActionsLogger();
+    restoreInputs(logger);
     const gitHubVersion = await getGitHubVersion();
     checkGitHubVersionInRange(gitHubVersion, logger);
     if (process.env["CODEQL_ACTION_INIT_HAS_RUN" /* INIT_ACTION_HAS_RUN */] !== "true") {
diff --git a/src/actions-util.ts b/src/actions-util.ts
index dd11f7aa0..6c7d6a78d 100644
--- a/src/actions-util.ts
+++ b/src/actions-util.ts
@@ -413,7 +413,7 @@ export const persistInputs = function (env: Env = getEnv()) {
 /**
  * Restores all inputs to the action from the persisted state.
  */
-export const restoreInputs = function () {
+export function restoreInputs(logger: Logger) {
   try {
     const persistedInputsValue = core.getState(persistedInputsKey);
     if (persistedInputsValue) {
@@ -424,9 +424,12 @@ export const restoreInputs = function () {
       }
     }
   } catch (err) {
-    throw new Error(`Unable to restore inputs: ${getErrorMessage(err)}`);
+    logger.error(`Unable to restore inputs: ${getErrorMessage(err)}`);
+    throw new Error(
+      "Failed to restore inputs from the state set by this action's main execution.",
+    );
   }
-};
+}
 
 export interface PullRequestBranches {
   base: string;
diff --git a/src/analyze-action-post.ts b/src/analyze-action-post.ts
index 732b52af1..3f9b2fafb 100644
--- a/src/analyze-action-post.ts
+++ b/src/analyze-action-post.ts
@@ -25,8 +25,8 @@ export async function runWrapper() {
   // possible, and only use safe functions outside.
 
   try {
-    actionsUtil.restoreInputs();
     const logger = getActionsLogger();
+    actionsUtil.restoreInputs(logger);
     const gitHubVersion = await getGitHubVersion();
     checkGitHubVersionInRange(gitHubVersion, logger);
 
diff --git a/src/init-action-post.ts b/src/init-action-post.ts
index 749020ac6..e3a68b0e5 100644
--- a/src/init-action-post.ts
+++ b/src/init-action-post.ts
@@ -62,7 +62,7 @@ async function run(startedAt: Date) {
     const jobStatus = getOptionalInput("job-status");
 
     // Restore inputs from `init` Action.
-    restoreInputs();
+    restoreInputs(logger);
 
     const gitHubVersion = await getGitHubVersion();
     checkGitHubVersionInRange(gitHubVersion, logger);
diff --git a/src/start-proxy-action-post.ts b/src/start-proxy-action-post.ts
index 6b59052c6..d300d528b 100644
--- a/src/start-proxy-action-post.ts
+++ b/src/start-proxy-action-post.ts
@@ -20,7 +20,7 @@ export async function runWrapper() {
 
   try {
     // Restore inputs from `start-proxy` Action.
-    actionsUtil.restoreInputs();
+    actionsUtil.restoreInputs(logger);
 
     // Kill the running proxy
     const pid = core.getState("proxy-process-pid");
diff --git a/src/upload-sarif-action-post.ts b/src/upload-sarif-action-post.ts
index a27fe1667..bc0e1361c 100644
--- a/src/upload-sarif-action-post.ts
+++ b/src/upload-sarif-action-post.ts
@@ -17,9 +17,10 @@ export async function runWrapper() {
   // possible, and only use safe functions outside.
 
   try {
-    // Restore inputs from `upload-sarif` Action.
-    actionsUtil.restoreInputs();
     const logger = getActionsLogger();
+
+    // Restore inputs from `upload-sarif` Action.
+    actionsUtil.restoreInputs(logger);
     const gitHubVersion = await getGitHubVersion();
     checkGitHubVersionInRange(gitHubVersion, logger);