diff --git a/crates/notsecrets/src/lib.rs b/crates/notsecrets/src/lib.rs
index 38d28e2..1adf670 100644
--- a/crates/notsecrets/src/lib.rs
+++ b/crates/notsecrets/src/lib.rs
@@ -32,7 +32,7 @@ pub fn install_age_key(key: &str) -> Result<PathBuf> {
     let path = dirs::home_dir()
         .context("cannot find home directory")?
         .join(".config/sops/age/keys.txt");
-    std::fs::create_dir_all(path.parent().unwrap())?;
+    std::fs::create_dir_all(path.parent().with_context(|| "age keys.txt path has no parent directory")?)?;
     std::fs::write(&path, key)?;
     #[cfg(unix)]
     {
@@ -45,7 +45,7 @@ pub fn install_age_key(key: &str) -> Result<PathBuf> {
 /// Run `sops --decrypt <sops_file>` and return the decrypted content.
 pub fn decrypt_sops(sops_file: &Path) -> Result<String> {
     let output = Command::new("sops")
-        .args(["--decrypt", sops_file.to_str().unwrap()])
+        .args(["--decrypt", sops_file.to_str().ok_or_else(|| anyhow::anyhow!("sops path is not valid UTF-8"))?])
         .output()
         .context("failed to run sops")?;
 
diff --git a/crates/notstrap/src/lib.rs b/crates/notstrap/src/lib.rs
index 7ee7116..a5bdadb 100644
--- a/crates/notstrap/src/lib.rs
+++ b/crates/notstrap/src/lib.rs
@@ -108,7 +108,10 @@ pub fn run(opts: BootstrapOptions) -> Result<Report> {
                         let k = k.trim();
                         let v = v.trim().trim_matches('"');
                         if !k.is_empty() && !k.starts_with('#') {
-                            // Safety: single-threaded bootstrap, no concurrent env readers
+                            // SAFETY: `notstrap` is a single-threaded bootstrap binary. No other threads
+                            // are spawned before this point, and `env_injector` is called before any
+                            // `Command::spawn` calls in this `run()` invocation. Callers that use
+                            // `env_injector: None` (e.g. tests) never reach this block.
                             unsafe { std::env::set_var(k, v); }
                         }
                     }