From 8e55adf4ecf35d1edb105b2817a42d144645d46c Mon Sep 17 00:00:00 2001
From: Tim Neutkens <tim@timneutkens.nl>
Date: Sun, 22 Oct 2017 01:47:55 +0200
Subject: [PATCH] Render error as errorHtml (#3142)

---
 server/render.js | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/server/render.js b/server/render.js
index 0bb99ab8..a62ef5c4 100644
--- a/server/render.js
+++ b/server/render.js
@@ -78,17 +78,20 @@ async function doRender (req, res, pathname, query, {
     let html
     let head
     let errorHtml = ''
+
     try {
-      html = render(app)
+      if (err && dev) {
+        errorHtml = render(createElement(ErrorDebug, { error: err }))
+      } else if (err) {
+        errorHtml = render(app)
+      } else {
+        html = render(app)
+      }
     } finally {
       head = Head.rewind() || defaultHead()
     }
     const chunks = loadChunks({ dev, dir, dist, availableChunks })
 
-    if (err && dev) {
-      errorHtml = render(createElement(ErrorDebug, { error: err }))
-    }
-
     return { html, head, errorHtml, chunks }
   }