From 685cf701e0716a3ef5652500b55fb8eee5937dee Mon Sep 17 00:00:00 2001
From: Nikolai Onken <nikolai@nikolaionken.com>
Date: Wed, 6 May 2015 15:18:58 +0200
Subject: [PATCH] properly encode string errors when accept is application/json

---
 package.json                      | 1 -
 plugins/c9.error/error_handler.js | 5 +++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 6bbf9ed8..dc3d5289 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,6 @@
     },
     "dependencies": {
         "acorn": ">=0.11.0",
-        "amd-loader": "",
         "async": "^0.9.0",
         "base64id": "~0.1.0",
         "c9": "",
diff --git a/plugins/c9.error/error_handler.js b/plugins/c9.error/error_handler.js
index 2e085929..ee6786f0 100644
--- a/plugins/c9.error/error_handler.js
+++ b/plugins/c9.error/error_handler.js
@@ -1,5 +1,7 @@
 "use strict";
 
+var error = require("http-error");
+
 plugin.consumes = [
     "connect",
     "connect.static", 
@@ -78,6 +80,9 @@ function plugin(options, imports, register) {
     connect.useStart(frontdoor.middleware.jsonWriter());
     
     connect.useError(function(err, req, res, next) {
+        if (typeof err == "string")
+            err = new error.InternalServerError(err);
+            
         var statusCode = parseInt(err.code || err.status || res.statusCode, 10) || 500;
 
         if (statusCode < 400)