diff --git a/internal/core/thirdparty/tantivy/tantivy-binding/src/index_ngram_writer.rs b/internal/core/thirdparty/tantivy/tantivy-binding/src/index_ngram_writer.rs
index ff2a02d9eb..99dea68514 100644
--- a/internal/core/thirdparty/tantivy/tantivy-binding/src/index_ngram_writer.rs
+++ b/internal/core/thirdparty/tantivy/tantivy-binding/src/index_ngram_writer.rs
@@ -45,11 +45,10 @@ impl IndexWriterWrapper {
 
         let (schema, field) = build_ngram_schema(field_name);
 
-        let index = Index::create_in_dir(path, schema).unwrap();
+        let index = Index::create_in_dir(path, schema)?;
         index.tokenizers().register(NGRAM_TOKENIZER, tokenizer);
-        let index_writer = index
-            .writer_with_num_threads(num_threads, overall_memory_budget_in_bytes)
-            .unwrap();
+        let index_writer =
+            index.writer_with_num_threads(num_threads, overall_memory_budget_in_bytes)?;
 
         Ok(IndexWriterWrapper::V7(IndexWriterWrapperImpl {
             field,
diff --git a/internal/core/thirdparty/tantivy/tantivy-binding/src/index_writer_v5/index_writer_text.rs b/internal/core/thirdparty/tantivy/tantivy-binding/src/index_writer_v5/index_writer_text.rs
index 5417351c07..27f40a2366 100644
--- a/internal/core/thirdparty/tantivy/tantivy-binding/src/index_writer_v5/index_writer_text.rs
+++ b/internal/core/thirdparty/tantivy/tantivy-binding/src/index_writer_v5/index_writer_text.rs
@@ -43,12 +43,11 @@ impl IndexWriterWrapperImpl {
         let index = if in_ram {
             Index::create_in_ram(schema)
         } else {
-            Index::create_in_dir(path, schema).unwrap()
+            Index::create_in_dir(path, schema)?
         };
         index.tokenizers().register(tokenizer_name, tokenizer);
-        let index_writer = index
-            .writer_with_num_threads(num_threads, overall_memory_budget_in_bytes)
-            .unwrap();
+        let index_writer =
+            index.writer_with_num_threads(num_threads, overall_memory_budget_in_bytes)?;
 
         Ok(IndexWriterWrapperImpl {
             field,
diff --git a/internal/core/thirdparty/tantivy/tantivy-binding/src/index_writer_v7/index_writer_text.rs b/internal/core/thirdparty/tantivy/tantivy-binding/src/index_writer_v7/index_writer_text.rs
index 9209705b58..3845c33d90 100644
--- a/internal/core/thirdparty/tantivy/tantivy-binding/src/index_writer_v7/index_writer_text.rs
+++ b/internal/core/thirdparty/tantivy/tantivy-binding/src/index_writer_v7/index_writer_text.rs
@@ -44,12 +44,11 @@ impl IndexWriterWrapperImpl {
         let index = if in_ram {
             Index::create_in_ram(schema)
         } else {
-            Index::create_in_dir(path, schema).unwrap()
+            Index::create_in_dir(path, schema)?
         };
         index.tokenizers().register(analyzer_name, analyzer);
-        let index_writer = index
-            .writer_with_num_threads(num_threads, overall_memory_budget_in_bytes)
-            .unwrap();
+        let index_writer =
+            index.writer_with_num_threads(num_threads, overall_memory_budget_in_bytes)?;
 
         Ok(IndexWriterWrapperImpl {
             field,
diff --git a/internal/core/thirdparty/tantivy/tantivy-binding/src/util.rs b/internal/core/thirdparty/tantivy/tantivy-binding/src/util.rs
index 26d852d9ae..673baeefab 100644
--- a/internal/core/thirdparty/tantivy/tantivy-binding/src/util.rs
+++ b/internal/core/thirdparty/tantivy/tantivy-binding/src/util.rs
@@ -22,7 +22,7 @@ pub fn index_exist(path: &str) -> bool {
         );
         return false;
     };
-    let exists = Index::exists(&dir).unwrap();
+    let exists = Index::exists(&dir).unwrap_or(false);
     if !exists {
         init_log();
         let files: Vec<_> = std::fs::read_dir(path)