diff --git a/re2o/urls.py b/re2o/urls.py
index 3322e82b..87a5b346 100644
--- a/re2o/urls.py
+++ b/re2o/urls.py
@@ -50,6 +50,7 @@ from django.contrib.auth import views as auth_views
 from .views import index, about_page
 
 handler500 = 're2o.views.handler500'
+handler404 = 're2o.views.handler404'
 
 urlpatterns = [
     url(r'^$', index, name='index'),
diff --git a/re2o/views.py b/re2o/views.py
index 3c5cde09..8d98d927 100644
--- a/re2o/views.py
+++ b/re2o/views.py
@@ -229,3 +229,8 @@ def about_page(request):
 def handler500(request):
     """The handler view for a 500 error"""
     return render(request, 'errors/500.html')
+
+
+def handler404(request):
+    """The handler view for a 404 error"""
+    return render(request, 'errors/404.html')
diff --git a/templates/404.html b/templates/errors/404.html
similarity index 100%
rename from templates/404.html
rename to templates/errors/404.html