diff --git a/src/server/serverError.coffee b/src/server/serverError.coffee
index 5712484d50..ba5c90b63b 100644
--- a/src/server/serverError.coffee
+++ b/src/server/serverError.coffee
@@ -17,5 +17,4 @@ module.exports = (root) ->
     else if status >= 400 and status < 600
       res.send status
     else
-      #TODO send error to email
-      res.redirect('/500.html')
\ No newline at end of file
+      staticPages.render 'error', res, {message, status}, status
\ No newline at end of file
diff --git a/views/error.html b/views/error.html
new file mode 100644
index 0000000000..10c9bba5c9
--- /dev/null
+++ b/views/error.html
@@ -0,0 +1,6 @@
+<Title:>
+  {{status}}
+
+<Body:>
+  <h1>{{status}}</h1>
+  <p>{{message}}</p>
\ No newline at end of file