diff --git a/endpoints/api/tag.py b/endpoints/api/tag.py
index 4cdee1feb..c7fa8c805 100644
--- a/endpoints/api/tag.py
+++ b/endpoints/api/tag.py
@@ -27,7 +27,7 @@ class ListRepositoryTags(RepositoryParamResource):
   def get(self, args, namespace, repository):
     repo = model.get_repository(namespace, repository)
     if not repo:
-      abort(404)
+      raise NotFound()
 
     def tag_view(tag):
       tag_info = {