Render error as errorHtml (vercel#3142)

timneutkens · rauchg · commit 8e55adf4ecf3 · 2017-10-21T16:47:55.000-07:00
diff --git 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 }
   }
 
