diff --git a/check_whence.py b/check_whence.py
index c3d4a2e38f095ec806a150bf25c5065445ff393f..1fece4f4920a1fdcce7589e54cdc37e1b4c2100c 100755
--- a/check_whence.py
+++ b/check_whence.py
@@ -60,9 +60,12 @@ def list_links_list():
 
 
 def list_git():
-    with os.popen("git ls-files") as git_files:
-        for line in git_files:
-            yield line.rstrip("\n")
+    git_files = os.popen("git ls-files")
+    for line in git_files:
+        yield line.rstrip("\n")
+
+    if git_files.close():
+        sys.stderr.write("W: git file listing failed, skipping some validation\n")
 
 
 def main():
@@ -135,7 +138,7 @@ def main():
             )
             ret = 1
 
-    for name in sorted(list(known_files - git_files)):
+    for name in sorted(list(known_files - git_files) if len(git_files) else list()):
         sys.stderr.write("E: %s listed in WHENCE does not exist\n" % name)
         ret = 1
 
@@ -151,10 +154,10 @@ def main():
                 break
             valid_targets.add(dirname)
 
-    for link, target in sorted(links_list):
+    for link, target in sorted(links_list if len(git_files) else list()):
         if target not in valid_targets:
             sys.stderr.write(
-                "E: target %s of link %s in WHENCE" " does not exist\n" % (target, link)
+                "E: target %s of link %s in WHENCE does not exist\n" % (target, link)
             )
             ret = 1