diff --git a/tfhe/src/js_on_wasm_api/js_high_level_api/integers.rs b/tfhe/src/js_on_wasm_api/js_high_level_api/integers.rs
index 8c19a4f656..6f00bb5c6d 100644
--- a/tfhe/src/js_on_wasm_api/js_high_level_api/integers.rs
+++ b/tfhe/src/js_on_wasm_api/js_high_level_api/integers.rs
@@ -980,8 +980,10 @@ macro_rules! define_expander_get_method {
                     pub fn [<get_uint $num_bits>] (&mut self, index: usize) -> Result<[<FheUint $num_bits>], JsError> {
                         catch_panic_result(|| {
                            self.0.get::<crate::[<FheUint $num_bits>]>(index)
-                                .unwrap()
-                                .map_err(into_js_error)
+                                .map_or_else(
+                                    || Err(JsError::new(&format!("Index {index} is out of bounds"))),
+                                    |a| a.map_err(into_js_error),
+                                )
                                 .map([<FheUint $num_bits>])
                         })
                     }
@@ -1003,8 +1005,10 @@ macro_rules! define_expander_get_method {
                     pub fn [<get_int $num_bits>] (&mut self, index: usize) -> Result<[<FheInt $num_bits>], JsError> {
                         catch_panic_result(|| {
                            self.0.get::<crate::[<FheInt $num_bits>]>(index)
-                                .unwrap()
-                                .map_err(into_js_error)
+                                .map_or_else(
+                                    || Err(JsError::new(&format!("Index {index} is out of bounds"))),
+                                    |a| a.map_err(into_js_error),
+                                )
                                 .map([<FheInt $num_bits>])
                         })
                     }
@@ -1026,8 +1030,10 @@ impl CompactCiphertextListExpander {
         catch_panic_result(|| {
             self.0
                 .get::<crate::FheBool>(index)
-                .unwrap()
-                .map_err(into_js_error)
+                .map_or_else(
+                    || Err(JsError::new(&format!("Index {index} is out of bounds"))),
+                    |a| a.map_err(into_js_error),
+                )
                 .map(FheBool)
         })
     }