diff --git a/aider/main.py b/aider/main.py
index 163817b84..38fa32ea1 100644
--- a/aider/main.py
+++ b/aider/main.py
@@ -89,7 +89,7 @@ def setup_git(git_root, io):
             pass
         try:
             user_email = config.get_value("user", "email", None)
-        except configparser.NoSectionError:
+        except (configparser.NoSectionError, configparser.NoOptionError):
             pass
 
     if user_name and user_email: