From 84824b132a5fc755962218df846a620e6d6e128a Mon Sep 17 00:00:00 2001
From: Sergey Tarasov <dzirtusss@gmail.com>
Date: Thu, 18 Aug 2016 15:15:44 +0300
Subject: [PATCH] moved throw from handleError to clientStartup

---
 node_package/src/clientStartup.js | 7 ++-----
 node_package/src/handleError.js   | 9 ++-------
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/node_package/src/clientStartup.js b/node_package/src/clientStartup.js
index 0075bfb72..0c7ebba54 100644
--- a/node_package/src/clientStartup.js
+++ b/node_package/src/clientStartup.js
@@ -78,11 +78,8 @@ You should return a React.Component always for the client side entry point.`);
       }
     }
   } catch (e) {
-    handleError({
-      e,
-      name,
-      serverSide: false,
-    });
+    e.message = `Exception in rendering ${name}. ${e.message}`;
+    throw e;
   }
 }
 
diff --git a/node_package/src/handleError.js b/node_package/src/handleError.js
index a977e60cd..0c5f70b70 100644
--- a/node_package/src/handleError.js
+++ b/node_package/src/handleError.js
@@ -53,19 +53,14 @@ export default (options) => {
   console.error(`message: ${e.message}`);
   console.error(`stack: ${e.stack}`);
 
-  msg += `Exception in rendering!
+  if (serverSide) {
+    msg += `Exception in rendering!
 ${e.fileName ? `\nlocation: ${e.fileName}:${e.lineNumber}` : ''}
 Message: ${e.message}
 
 ${e.stack}`;
 
-  if (serverSide) {
     const reactElement = React.createElement('pre', null, msg);
     return ReactDOMServer.renderToString(reactElement);
-  } else {
-    var newError = new Error(msg);
-
-    newError.cause = e;
-    throw newError;
   }
 };