diff --git a/aider/main.py b/aider/main.py
index 9cf0dda10..ca9354ebd 100644
--- a/aider/main.py
+++ b/aider/main.py
@@ -66,7 +66,7 @@ def setup_git(git_root, io):
     with repo.config_reader() as config:
         try:
             user_name = config.get_value("user", "name", None)
-        except configparser.NoSectionError:
+        except (configparser.NoSectionError, configparser.NoOptionError):
             pass
         try:
             user_email = config.get_value("user", "email", None)