diff --git a/lib/renderers/JsonRenderer.js b/lib/renderers/JsonRenderer.js
index 1fe6a467..0367bffa 100644
--- a/lib/renderers/JsonRenderer.js
+++ b/lib/renderers/JsonRenderer.js
@@ -13,8 +13,16 @@ JsonRenderer.prototype.end = function (data) {
 };
 
 JsonRenderer.prototype.error = function (err) {
+    var message = err.message;
+
     err.id = err.code || 'error';
     err.level = 'error';
+    err.data = err.data || {};
+
+    // Need to set message again because it is
+    // not enumerable in some cases
+    delete err.message;
+    err.message = message;
 
     this.log(err);
     this.end();