diff --git a/data/userfiles.py b/data/userfiles.py
index eb9971ff7..79fbcb507 100644
--- a/data/userfiles.py
+++ b/data/userfiles.py
@@ -6,7 +6,7 @@ import magic
 
 from boto.s3.key import Key
 from uuid import uuid4
-from flask import url_for, request, send_file, make_response
+from flask import url_for, request, send_file, make_response, abort
 from flask.views import View
 
 
@@ -99,6 +99,9 @@ class UserfilesHandlers(View):
 
   def get(self, file_id):
     path = self._userfiles.file_path(file_id)
+    if not os.path.exists(path):
+      abort(404)
+
     logger.debug('Sending path: %s' % path)
     return send_file(path, mimetype=self._magic.from_file(path))
 
diff --git a/endpoints/trigger.py b/endpoints/trigger.py
index 7a5ab122d..5d9cecf68 100644
--- a/endpoints/trigger.py
+++ b/endpoints/trigger.py
@@ -275,7 +275,6 @@ class GithubBuildTrigger(BuildTrigger):
     tarball_subdir = ''
     with SpooledTemporaryFile(CHUNK_SIZE) as tarball:
       for chunk in download_archive.iter_content(CHUNK_SIZE):
-        logger.debug('Writing chunk of size: %s', len(chunk))
         tarball.write(chunk)
 
       # Seek to position 0 to make tarfile happy