diff --git a/endpoints/api/discovery.py b/endpoints/api/discovery.py
index 1995c6b42..c3525639f 100644
--- a/endpoints/api/discovery.py
+++ b/endpoints/api/discovery.py
@@ -125,7 +125,11 @@ def swagger_route_data(include_internal=False, compact=False):
               new_operation['requires_fresh_login'] = True
 
           if not internal or (internal and include_internal):
-            operations.append(new_operation)
+            # Swagger requires valid nicknames on all operations.
+            if new_operation.get('nickname'):              
+              operations.append(new_operation)
+            else:
+              logger.debug('Operation missing nickname: %s' % method)
 
       swagger_path = PARAM_REGEX.sub(r'{\2}', rule.rule)
       new_resource = {