diff --git a/auth/auth.py b/auth/auth.py
index 6109a2eec..c6ea4a744 100644
--- a/auth/auth.py
+++ b/auth/auth.py
@@ -186,7 +186,7 @@ def process_oauth(func):
       normalized = [part.strip() for part in auth.split(' ') if part]
       if normalized[0].lower() != 'bearer' or len(normalized) != 2:
         logger.debug('Invalid oauth bearer token format.')
-        return
+        return func(*args, **kwargs)
 
       token = normalized[1]
       _validate_and_apply_oauth_token(token)
diff --git a/endpoints/api/tag.py b/endpoints/api/tag.py
index 865c04c71..d3f8a04f9 100644
--- a/endpoints/api/tag.py
+++ b/endpoints/api/tag.py
@@ -24,7 +24,7 @@ class ListRepositoryTags(RepositoryParamResource):
   def get(self, args, namespace, repository):
     repo = model.repository.get_repository(namespace, repository)
     if not repo:
-      abort(404)
+      raise NotFound()
 
     def tag_view(tag):
       tag_info = {