diff --git a/go/base/command_utils.py b/go/base/command_utils.py
index dab797073..d4974aaa8 100644
--- a/go/base/command_utils.py
+++ b/go/base/command_utils.py
@@ -69,7 +69,7 @@ def mk_user_api(self, email_address=None, options=None):
         if email_address is None and options is None:
             raise ValueError("email_address or options is required")
         if email_address is None:
-            if 'email_address' not in options:
+            if options.get('email_address', None) is None:
                 raise CommandError("--email-address must be specified")
             email_address = options.get('email_address')
         user = get_user_by_email(email_address)
diff --git a/go/base/tests/test_command_utils.py b/go/base/tests/test_command_utils.py
index 8a0e317b0..ea2271fee 100644
--- a/go/base/tests/test_command_utils.py
+++ b/go/base/tests/test_command_utils.py
@@ -28,6 +28,9 @@ def test_user_email_required(self):
         self.assertRaisesRegexp(
             CommandError, '--email-address must be specified',
             self.command.handle)
+        self.assertRaisesRegexp(
+            CommandError, '--email-address must be specified',
+            self.command.handle, email_address=None)
 
     def test_user_account_must_exist(self):
         self.assertRaisesRegexp(