diff --git a/botserver/src/drive/drive_compiler.rs b/botserver/src/drive/drive_compiler.rs
index a79a4300..9c81efd5 100644
--- a/botserver/src/drive/drive_compiler.rs
+++ b/botserver/src/drive/drive_compiler.rs
@@ -116,7 +116,7 @@ impl DriveCompiler {
         }
 
         let bot_name = parts[0].trim_end_matches(".gbai");
-        let tool_name = parts.last().unwrap().trim_end_matches(".bas");
+        let tool_name = parts.last().ok_or("Invalid file path")?.trim_end_matches(".bas");
 
         // Work dir: /opt/gbo/work/{bot}.gbai/{bot}.gbdialog/
         let work_dir = self.work_root.join(format!("{}.gbai/{}.gbdialog", bot_name, bot_name));
diff --git a/botserver/src/drive/vectordb.rs b/botserver/src/drive/vectordb.rs
index a18c86a8..51a2e279 100644
--- a/botserver/src/drive/vectordb.rs
+++ b/botserver/src/drive/vectordb.rs
@@ -586,7 +586,7 @@ Ok(content)
         "text/xml" | "application/xml" | "text/html" => {
             let content = fs::read_to_string(file_path).await?;
 
-            let tag_regex = regex::Regex::new(r"<[^>]+>").expect("valid regex");
+            let tag_regex = regex::Regex::new(r"<[^>]+>").map_err(|e| anyhow::anyhow!("Invalid regex: {}", e))?;
             let text = tag_regex.replace_all(&content, " ").to_string();
             Ok(text.trim().to_string())
         }
@@ -594,8 +594,8 @@ Ok(content)
         "text/rtf" | "application/rtf" => {
             let content = fs::read_to_string(file_path).await?;
 
-            let control_regex = regex::Regex::new(r"\\[a-z]+[\-0-9]*[ ]?").expect("valid regex");
-            let group_regex = regex::Regex::new(r"[\{\}]").expect("valid regex");
+            let control_regex = regex::Regex::new(r"\\[a-z]+[\-0-9]*[ ]?").map_err(|e| anyhow::anyhow!("Invalid regex: {}", e))?;
+            let group_regex = regex::Regex::new(r"[\{\}]").map_err(|e| anyhow::anyhow!("Invalid regex: {}", e))?;
 
             let mut text = control_regex.replace_all(&content, " ").to_string();
             text = group_regex.replace_all(&text, "").to_string();
@@ -652,7 +652,7 @@ async fn extract_docx_text(file_path: &Path) -> Result<String> {
             let mut xml_content = String::new();
             std::io::Read::read_to_string(&mut document, &mut xml_content)?;
 
-            let text_regex = regex::Regex::new(r"<w:t[^>]*>([^<]*)</w:t>").expect("valid regex");
+            let text_regex = regex::Regex::new(r"<w:t[^>]*>([^<]*)</w:t>").map_err(|e| anyhow::anyhow!("Invalid regex: {}", e))?;
 
             content = text_regex
                 .captures_iter(&xml_content)
diff --git a/botserver/src/vector-db/qdrant_native.rs b/botserver/src/vector-db/qdrant_native.rs
index bb17ef8a..c554c659 100644
--- a/botserver/src/vector-db/qdrant_native.rs
+++ b/botserver/src/vector-db/qdrant_native.rs
@@ -43,8 +43,8 @@ impl QdrantClient {
     pub fn new(url: &str) -> Self {
         let client = Client::builder()
             .build()
-            .expect("Failed to create HTTP client");
-        
+            .unwrap_or_else(|_| Client::new());
+
         Self {
             client,
             url: url.trim_end_matches('/').to_string(),