From 3898cb53b4608ce5280b89d5d826ea3c971a3496 Mon Sep 17 00:00:00 2001
From: Arunoda Susiripala <arunoda.susiripala@gmail.com>
Date: Fri, 16 Jun 2017 16:43:55 +0530
Subject: [PATCH] Make sure page-loader doesn't throw errors when registering.
 (#2282)

Even if it does it, we need to mark it as a page error.
---
 lib/page-loader.js | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/lib/page-loader.js b/lib/page-loader.js
index 8cca8021..aa0c211e 100644
--- a/lib/page-loader.js
+++ b/lib/page-loader.js
@@ -87,9 +87,14 @@ export default class PageLoader {
   // This method if called by the route code.
   registerPage (route, regFn) {
     const register = () => {
-      const { error, page } = regFn()
-      this.pageCache[route] = { error, page }
-      this.pageRegisterEvents.emit(route, { error, page })
+      try {
+        const { error, page } = regFn()
+        this.pageCache[route] = { error, page }
+        this.pageRegisterEvents.emit(route, { error, page })
+      } catch (error) {
+        this.pageCache[route] = { error }
+        this.pageRegisterEvents.emit(route, { error })
+      }
     }
 
     // Wait for webpack to became idle if it's not.