diff --git a/src/build_helper/src/git.rs b/src/build_helper/src/git.rs
index cbefb836c0044..4a2e36aaa5e43 100644
--- a/src/build_helper/src/git.rs
+++ b/src/build_helper/src/git.rs
@@ -274,14 +274,15 @@ pub fn get_git_modified_files(
     let files = output_result(git.args(["diff-index", "--name-status", merge_base.trim()]))?
         .lines()
         .filter_map(|f| {
-            let (status, name) = f.trim().split_once(char::is_whitespace).unwrap();
+            let (status, name) = f.trim().split_once(char::is_whitespace)?;
             if status == "D" {
                 None
             } else if Path::new(name).extension().map_or(extensions.is_empty(), |ext| {
                 // If there is no extension, we allow the path if `extensions` is empty
                 // If there is an extension, we allow it if `extension` is empty or it contains the
                 // extension.
-                extensions.is_empty() || extensions.contains(&ext.to_str().unwrap())
+                extensions.is_empty()
+                    || ext.to_str().map_or(false, |ext_str| extensions.contains(&ext_str))
             }) {
                 Some(name.to_owned())
             } else {
diff --git a/src/build_helper/src/stage0_parser.rs b/src/build_helper/src/stage0_parser.rs
index 2723f4aa7b914..a66d575c1b9e5 100644
--- a/src/build_helper/src/stage0_parser.rs
+++ b/src/build_helper/src/stage0_parser.rs
@@ -39,7 +39,13 @@ pub fn parse_stage0_file() -> Stage0 {
             continue;
         }
 
-        let (key, value) = line.split_once('=').unwrap();
+        let (key, value) = match line.split_once('=') {
+            Some((k, v)) => (k, v),
+            None => {
+                println!("Warning: Skipping malformed config line {}", line);
+                continue;
+            }
+        };
 
         match key {
             "dist_server" => stage0.config.dist_server = value.to_owned(),
diff --git a/src/build_helper/src/util.rs b/src/build_helper/src/util.rs
index 1bdbb7515e252..8b208d25306a8 100644
--- a/src/build_helper/src/util.rs
+++ b/src/build_helper/src/util.rs
@@ -64,7 +64,13 @@ pub fn parse_gitmodules(target_dir: &Path) -> Vec<String> {
     let gitmodules = target_dir.join(".gitmodules");
     assert!(gitmodules.exists(), "'{}' file is missing.", gitmodules.display());
 
-    let file = File::open(gitmodules).unwrap();
+    let file = match File::open(&gitmodules) {
+        Ok(f) => f,
+        Err(_) => {
+            eprintln!("Warning: Could not open .gitmodules file at {}", gitmodules.display());
+            return Vec::new();
+        }
+    };
 
     let mut submodules_paths = vec![];
     for line in BufReader::new(file).lines().map_while(Result::ok) {