diff --git a/fetch.js b/fetch.js
index 23cbac7f..ff0d75fc 100644
--- a/fetch.js
+++ b/fetch.js
@@ -29,7 +29,9 @@ try {
             if (cacheFetchingResult) {
                 core.info(`${cacheFetchingResult} cache fetched!`);
                 core.setOutput("hit", "1");
-                core.saveState("CACHE_STATE", "hit");
+                if (cacheFetchingResult === keyString) {
+                    core.saveState("CACHE_STATE", "hit");
+                }
 
                 if (cacheToolchain && skipBuildingToolchain) {
                     execSync("sed -i 's/ $(tool.*\\/stamp-compile)//;' Makefile");
@@ -42,5 +44,5 @@ try {
         }
     }
 } catch (error) {
-    core.setFailed(error.message);
+    core.setFailed(error instanceof Error ? error.message : String(error));
 }
\ No newline at end of file
diff --git a/save.js b/save.js
index 0c3a1fb6..c2bc1348 100644
--- a/save.js
+++ b/save.js
@@ -25,7 +25,7 @@ try {
             core.debug(`Cache paths: ${paths.join(", ")}`);
 
             const cacheId = await cache.saveCache(paths, keyString);
-            if (cacheId) {
+            if (cacheId > -1) {
                 core.info(`Cache saved with key: ${keyString} (id: ${cacheId})`);
             }
         } else {
@@ -33,5 +33,5 @@ try {
         }
     }
 } catch (error) {
-    core.warning(error.message);
+    core.warning(error instanceof Error ? error.message : String(error));
 }