diff --git a/code/app.py b/code/app.py
index f544ea8..4313d59 100644
--- a/code/app.py
+++ b/code/app.py
@@ -526,6 +526,8 @@ def logout(name):
 @app.route('/e/<ehash>/<filename>', methods=['GET'])
 def download_expiring(ehash, filename = None):
     file_path, expiring = get_expiring_file(ehash)
+    if file_path == None:
+      return 'No such link', 404
     if not os.path.exists(file_path):
         return 'No such file', 404
     if expiring - time.time() < 0:
diff --git a/code/utils/files.py b/code/utils/files.py
index 6c8af9c..4e012ac 100644
--- a/code/utils/files.py
+++ b/code/utils/files.py
@@ -90,6 +90,7 @@ def expire_database_create():
         file text NOT NULL,
         expires integer NOT NULL
     );""")
+    # Clear out expired items
     cursor.execute("DELETE FROM expiring WHERE expires < ?",
       (
         time.time(),