diff --git a/actions/setup/js/extra_empty_commit.cjs b/actions/setup/js/extra_empty_commit.cjs
index 33a38e8797..ddb88e133f 100644
--- a/actions/setup/js/extra_empty_commit.cjs
+++ b/actions/setup/js/extra_empty_commit.cjs
@@ -2,6 +2,7 @@
 /// <reference types="@actions/github-script" />
 
 const { validateTargetRepo, parseAllowedRepos, getDefaultTargetRepo } = require("./repo_helpers.cjs");
+const { getErrorMessage } = require("./error_helpers.cjs");
 
 /**
  * @fileoverview Extra Empty Commit Helper
@@ -150,7 +151,7 @@ async function pushExtraEmptyCommit({ branchName, repoOwner, repoName, commitMes
     } catch (error) {
       // Non-fatal: if fetch/reset fails (e.g. branch not yet on remote), continue
       // with the local HEAD and attempt the push anyway.
-      const syncErrorMessage = error instanceof Error ? error.message : String(error);
+      const syncErrorMessage = getErrorMessage(error);
       core.warning(`Could not sync local branch with remote ${branchName} - will attempt push with local HEAD. Underlying error: ${syncErrorMessage}`);
     }
 
@@ -170,7 +171,7 @@ async function pushExtraEmptyCommit({ branchName, repoOwner, repoName, commitMes
 
     return { success: true };
   } catch (error) {
-    const errorMessage = error instanceof Error ? error.message : String(error);
+    const errorMessage = getErrorMessage(error);
     core.warning(`Failed to push extra empty commit: ${errorMessage}`);
 
     // Clean up the temporary remote on failure