diff --git a/aider/repo.py b/aider/repo.py
index 96f0639f1..1ed5f49a6 100644
--- a/aider/repo.py
+++ b/aider/repo.py
@@ -257,6 +257,10 @@ class GitRepo:
             commit = self.repo.head.commit
         except ValueError:
             commit = None
+        except ANY_GIT_ERROR as err:
+            self.io.tool_error(f"Unable to list files in git repo: {err}")
+            self.io.tool_output("Is your git repo corrupted?")
+            return []
 
         files = set()
         if commit: