diff --git a/run.py b/run.py
index ca9d717..86f8d04 100755
--- a/run.py
+++ b/run.py
@@ -57,6 +57,10 @@ def auth(key):
     return False
 
 
+def error_page(error):
+  return render_template('error.html', page=config["SITE_DATA"], error=error)
+
+
 def allowed_file(filename):
   if config["ALLOW_ALL_FILES"]:
     return True
@@ -96,7 +100,7 @@ def upload_file():
         return json.dumps(data)
     else:
       print_log('Notice', 'Forbidden file received')
-      return render_template('error.html', page=config["SITE_DATA"], error="This file isn't allowed, sorry!")
+      return error_page("This file isn't allowed, sorry!")
 
   # Return Web UI if we have a GET request
   elif request.method == 'GET':
@@ -116,6 +120,11 @@ def privacy():
 def faq():
   return render_template('faq.html', page=config["SITE_DATA"])
 
+# Custom 404
+@app.errorhandler(404)
+def page_not_found(e):
+    return render_template('error.html', page=config["SITE_DATA"], error="We couldn't find that. Are you sure you know what you're looking for?"), 404
+
 
 @app.route('/<filename>', methods=['GET'])
 def get_file(filename):