catch error when transforming output

packages/electrode-react-webapp/lib/render-output.js

@@ -137,9 +137,18 @@ class RenderOutput {
   }
 
   _finish() {
-    if (this._resolve) {
-      this._resolve(this._context.transform(this._result, this));
+    try {
+      if (this._resolve) {
+        this._resolve(this._context.transform(this._result, this));
+      }
+    } catch (error) {
+      if (this._reject) {
+        this._reject(error);
+      } else {
+        throw error;
+      }
     }
+
     this._resolve = this._reject = undefined;
   }
 

packages/electrode-react-webapp/test/spec/hapi.index.spec.js

@@ -1143,6 +1143,33 @@ describe("hapi electrode-react-webapp", () => {
     });
   });
 
+  it("should handle unexpected errors", () => {
+    const content = {
+      html: "<div>Hello Electrode</div>",
+      prefetch: "console.log('Hello');"
+    };
+    Object.defineProperty(content, "status", {
+      get: () => {
+        throw new Error("unexpected error");
+      }
+    });
+
+    assign(mainRoutePathOptions, { content: () => Promise.resolve(content) });
+
+    return electrodeServer(config).then(server => {
+      return server
+        .inject({
+          method: "GET",
+          url: "/"
+        })
+        .then(res => {
+          stopServer(server);
+          expect(res.statusCode).to.equal(500);
+          expect(res.result).contains("unexpected error");
+        });
+    });
+  });
+
   it("should handle 200 status @noss", () => {
     assign(mainRoutePathOptions, {
       content: {

packages/electrode-react-webapp/test/spec/render-output.spec.js

@@ -118,4 +118,13 @@ describe("render-output", function() {
       );
     });
   });
+
+  it("should rethrow if no _reject is available in _finish", () => {
+    const ro = new RenderOutput();
+    ro._reject = undefined;
+    ro._resolve = () => {
+      throw new Error("test error");
+    };
+    expect(() => ro._finish()).to.throw("test error");
+  });
 });