diff --git a/server/index.js b/server/index.js
index fe8124423371148324dc2a40fa244551eb5771e7..17c6caca34147487b0cadbedcf494baeb97196a4 100644
--- a/server/index.js
+++ b/server/index.js
@@ -34,10 +34,14 @@ export default class Server {
 
   getRequestHandler () {
     return (req, res, parsedUrl) => {
-      if (!parsedUrl || parsedUrl.query === null) {
+      if (!parsedUrl) {
         parsedUrl = parse(req.url, true)
       }
 
+      if (!parsedUrl.query) {
+        throw new Error('Please provide a parsed url to `handle` as third parameter. See https://github.com/zeit/next.js#custom-server-and-routing for an example.')
+      }
+
       this.run(req, res, parsedUrl)
       .catch((err) => {
         if (!this.quiet) console.error(err)