diff --git a/lib/handlers/error.js b/lib/handlers/error.js
index 03fbf696..5a8bd6c7 100644
--- a/lib/handlers/error.js
+++ b/lib/handlers/error.js
@@ -80,8 +80,8 @@ module.exports = Observable.extend({
       is_404: status === 404,
       root: this.helpers.url('', true),
       dave: this.helpers.urlForStatic('/images/logo.png')
-      err: err.toString(),
-      stack: err.stack
+      err: err,
+      stack: err.stack ? err.stack : ""
     });
   },