diff --git a/app/base/routes.py b/app/base/routes.py
index 01356e0..f2e389e 100644
--- a/app/base/routes.py
+++ b/app/base/routes.py
@@ -18,12 +18,20 @@ def route_default():
     return redirect(url_for('base_blueprint.login'))
 
 
+@blueprint.route('/<path:u_path>')
+def catch_all(u_path):
+    return render_template('errors/page_404.html'), 404
+
+
 @blueprint.route('/<template>')
 @login_required
 def route_template(template):
-    return render_template(template + '.html')
-
+    try:
+        return render_template(template + '.html')
+    except:
+        return render_template('errors/page_404.html'), 404
 
+    
 @blueprint.route('/fixed_<template>')
 @login_required
 def route_fixed_template(template):
diff --git a/app/base/static/build/js/login.js b/app/base/static/build/js/login.js
index cfdae7d..f3061b1 100644
--- a/app/base/static/build/js/login.js
+++ b/app/base/static/build/js/login.js
@@ -14,10 +14,10 @@ function signup() { // eslint-disable-line no-unused-vars
       dataType: 'json',
       data: $('#create-user-form').serialize(),
       success: function(result) {
-        if (result == 'duplicate') {
-          const message = 'Cannot create new user: duplicate entry.';
+        if (result !== 'success') {
+          const message = 'Error: ' + result;
           alertify.notify(message, 'error', 5);
-        } else {
+        }else {
           alertify.notify('New user created.', 'success', 5);
           document.getElementById('login-button').click();
         }