diff --git a/endpoints/index.py b/endpoints/index.py
index 671f8766f..d6f3ea448 100644
--- a/endpoints/index.py
+++ b/endpoints/index.py
@@ -33,10 +33,14 @@ def generate_headers(role='read'):
 
       if has_token_request:
         repo = model.get_repository(namespace, repository)
-        token = model.create_access_token(repo, role)
-        token_str = 'signature=%s' % token.code
-        response.headers['WWW-Authenticate'] = token_str
-        response.headers['X-Docker-Token'] = token_str
+        if repo:
+          token = model.create_access_token(repo, role)
+          token_str = 'signature=%s' % token.code
+          response.headers['WWW-Authenticate'] = token_str
+          response.headers['X-Docker-Token'] = token_str
+        else:
+          logger.info('Token request in non-existing repo: %s/%s' %
+                      (namespace, repository))
 
       return response
     return wrapper