diff --git a/app.js b/app.js
index 312b505..d93de6c 100644
--- a/app.js
+++ b/app.js
@@ -66,6 +66,9 @@ function initApp (config, callback) {
 	app.express.use(function (err, req, res, next) {
 		/* jshint unused: false */
 		app.emit('route-error', err);
+		if (process.env.NODE_ENV !== 'production') {
+			res.locals.error = err;
+		}
 		res.status(500);
 		res.render('500');
 	});
diff --git a/view/500.html b/view/500.html
index 58e0cce..3165123 100644
--- a/view/500.html
+++ b/view/500.html
@@ -2,8 +2,10 @@
 	<h1>Eeek! 500 error. This is serious.</h1>
 	<p class="h2">There isn't much you can do about this.</h2>
 	<p class="h4">Give it another go or try the <a href="/">home page</a>.</h4>
-	<p>Techy-stuff</p>
-	<pre>&lt;p&gt;Sample text here...&lt;/p&gt;</pre>
+	{{#if error}}
+		<h2>Stack-Trace</h2>
+		<pre>{{error.stack}}</pre>
+	{{/if}}
 </div>
 <div class="col-md-4">
 	<div class="well well-lg">