diff --git a/build_tools/lint.fish b/build_tools/lint.fish
index 5ac05d7d2..f40d4c354 100755
--- a/build_tools/lint.fish
+++ b/build_tools/lint.fish
@@ -54,8 +54,11 @@ else
         set files (git show --word-diff=porcelain --name-only --pretty=oneline)[2..-1]
     end
 
-    # Extract just the C/C++ files.
-    set c_files (string match -r '.*\.c(?:pp)?$' -- $files)
+    # Extract just the C/C++ files that exist.
+    set c_files
+    for file in (string match -r '.*\.c(?:pp)?$' -- $files)
+        test -f $file; and set c_files $c_files $file
+    end
 end
 
 # We now have a list of files to check so run the linters.
diff --git a/build_tools/style.fish b/build_tools/style.fish
index ee54216b4..b5b3b8719 100755
--- a/build_tools/style.fish
+++ b/build_tools/style.fish
@@ -42,8 +42,11 @@ else
         set files (git show --name-only --pretty=oneline | tail --lines=+2)
     end
 
-    # Extract just the C/C++ files.
-    set c_files (string match -r '^.*\.(?:c|cpp|h)$' -- $files)
+    # Extract just the C/C++ files that exist.
+    set c_files
+    for file in (string match -r '^.*\.(?:c|cpp|h)$' -- $files)
+        test -f $file; and set c_files $c_files $file
+    end
     # Extract just the fish files.
     set f_files (string match -r '^.*\.fish$' -- $files)
 end