diff --git a/.github/workflows/uniffi.yaml b/.github/workflows/uniffi.yaml
index 705e1fff..04284ae1 100644
--- a/.github/workflows/uniffi.yaml
+++ b/.github/workflows/uniffi.yaml
@@ -744,8 +744,10 @@ jobs:
           java-version: '17'
 
       - name: Setup Android SDK
-        uses: android-actions/setup-android@v2
+        uses: android-actions/setup-android@v3
         id: setup-android
+        with:
+          packages: 'platform-tools'
 
       - name: Download Kotlin bindings
         uses: actions/download-artifact@v4
diff --git a/core/engine/src/loader/memory.rs b/core/engine/src/loader/memory.rs
index f66996ad..dfd92d57 100644
--- a/core/engine/src/loader/memory.rs
+++ b/core/engine/src/loader/memory.rs
@@ -17,7 +17,7 @@ impl MemoryLoader {
         K: Into<String>,
         D: Into<DecisionContent>,
     {
-        let mut mref = self.memory_refs.write().unwrap();
+        let mut mref = self.memory_refs.write().unwrap_or_else(|e| e.into_inner());
         mref.insert(key.into(), Arc::new(content.into()));
     }
 
@@ -25,7 +25,7 @@ impl MemoryLoader {
     where
         K: AsRef<str>,
     {
-        let mref = self.memory_refs.read().unwrap();
+        let mref = self.memory_refs.read().unwrap_or_else(|e| e.into_inner());
         mref.get(key.as_ref()).map(|r| r.clone())
     }
 
@@ -33,7 +33,7 @@ impl MemoryLoader {
     where
         K: AsRef<str>,
     {
-        let mut mref = self.memory_refs.write().unwrap();
+        let mut mref = self.memory_refs.write().unwrap_or_else(|e| e.into_inner());
         mref.remove(key.as_ref()).is_some()
     }
 }
@@ -50,7 +50,7 @@ impl DecisionLoader for MemoryLoader {
     }
 
     fn keys(&self) -> Option<Vec<Arc<str>>> {
-        let mref = self.memory_refs.read().unwrap();
+        let mref = self.memory_refs.read().unwrap_or_else(|e| e.into_inner());
         Some(mref.keys().map(|k| Arc::from(k.as_str())).collect())
     }
 
diff --git a/core/engine/src/nodes/function/v1/script.rs b/core/engine/src/nodes/function/v1/script.rs
index 5fa4015d..6157cd14 100644
--- a/core/engine/src/nodes/function/v1/script.rs
+++ b/core/engine/src/nodes/function/v1/script.rs
@@ -38,9 +38,9 @@ impl Script {
                 "main",
                 "import 'internals'; globalThis.now = Date.now();",
             )
-            .unwrap()
+            .map_err(|e| map_js_error(&ctx, e))?
             .finish::<()>()
-            .unwrap();
+            .map_err(|e| map_js_error(&ctx, e))?;
 
             let _ = ctx
                 .globals()