fix(server): server entry point now throws if react router returns no…

… initial state (fixes bad urls breaking server)

server/middleware/render-route.js

@@ -1,14 +1,19 @@
-const router    = require('../../dist/server'),
+const runRouter = require('../../dist/server'),
       USE_CACHE = process.env.NODE_ENV === 'production';
 
 function renderIntoTemplate (template, content) {
   return template.replace('${content}', content);
 }
 
 module.exports = function makeRenderRouteMiddleware (template) {
-  return function *renderRouteMiddleware () {
-    const rendered = yield router(this.request);
+  return function *renderRouteMiddleware (next) {
+    try {
+      const rendered = yield runRouter(this.request);
 
-    this.body = renderIntoTemplate(template, rendered);
+      this.body = renderIntoTemplate(template, rendered);
+    } catch (e) {
+      console.log(e);
+      yield next;
+    }
   };
 };

src/entry-points/server.js

@@ -8,16 +8,21 @@ export default function render (request) {
   return function renderThunk (callback) {
     const location = new Location(request.path, request.query);
 
-    Router.run(routes, location, function (error, initialState, transition) {
-      try {
+    try {
+      Router.run(routes, location, function (error, initialState, transition) {
+        if (!initialState) {
+          throw new Error(
+            `Could not render ${request.path}: no initial state returned.`
+          );
+        }
+
         const rendered = React.renderToString(
           <App initialState={initialState} />
         );
-
         callback(null, rendered);
-      } catch (e) {
-        callback(e);
-      }
-    });
+      });
+    } catch (e) {
+      callback(e);
+    }
   };
 }