diff --git a/pkgs/clan-cli/clan_cli/flash.py b/pkgs/clan-cli/clan_cli/flash.py
index 8f306e9c2..c28f826b9 100644
--- a/pkgs/clan-cli/clan_cli/flash.py
+++ b/pkgs/clan-cli/clan_cli/flash.py
@@ -45,7 +45,7 @@ def list_possible_keymaps() -> list[str]:
 
     if not keymaps_dir.exists():
         msg = f"Keymaps directory '{keymaps_dir}' does not exist."
-        raise FileNotFoundError(msg)
+        raise ClanError(msg)
 
     keymap_files = []
 
@@ -67,7 +67,7 @@ def list_possible_languages() -> list[str]:
 
     if not locale_file.exists():
         msg = f"Locale file '{locale_file}' does not exist."
-        raise FileNotFoundError(msg)
+        raise ClanError(msg)
 
     with locale_file.open() as f:
         lines = f.readlines()
diff --git a/pkgs/clan-cli/clan_cli/machines/machines.py b/pkgs/clan-cli/clan_cli/machines/machines.py
index 2a77c6f33..1ccaeb42e 100644
--- a/pkgs/clan-cli/clan_cli/machines/machines.py
+++ b/pkgs/clan-cli/clan_cli/machines/machines.py
@@ -140,7 +140,7 @@ class Machine:
 
     def nix(
         self,
-        method: str,
+        method: Literal["eval", "build"],
         attr: str,
         extra_config: None | dict = None,
         impure: bool = False,
@@ -217,11 +217,7 @@ class Machine:
         if method == "eval":
             output = run_no_stdout(nix_eval(args)).stdout.strip()
             return output
-        if method == "build":
-            outpath = run_no_stdout(nix_build(args)).stdout.strip()
-            return Path(outpath)
-        msg = f"Unknown method {method}"
-        raise ValueError(msg)
+        return Path(run_no_stdout(nix_build(args)).stdout.strip())
 
     def eval_nix(
         self,