diff --git a/endpoints/api/superuser_models_pre_oci.py b/endpoints/api/superuser_models_pre_oci.py
index 93a3ebe21..e1aefe75f 100644
--- a/endpoints/api/superuser_models_pre_oci.py
+++ b/endpoints/api/superuser_models_pre_oci.py
@@ -38,6 +38,8 @@ def _create_log(log, log_kind):
 
 
 def _create_user(user):
+  if user is None:
+    return None
   return User(user.username, user.email, user.verified, user.enabled, user.robot)