diff --git a/errors/get-inital-props-as-an-instance-method.md b/errors/get-initial-props-as-an-instance-method.md
similarity index 100%
rename from errors/get-inital-props-as-an-instance-method.md
rename to errors/get-initial-props-as-an-instance-method.md
diff --git a/errors/popstate-state-empty.md b/errors/popstate-state-empty.md
new file mode 100644
index 00000000..3ec34db0
--- /dev/null
+++ b/errors/popstate-state-empty.md
@@ -0,0 +1,14 @@
+# `popstate` called with empty state
+
+#### Why This Error Occurred
+
+When using the browser back button the popstate event is triggered. Next.js sets 
+`popstate` event triggered but `event.state` did not have `url` or `as`, causing a route change failure
+
+#### Possible Ways to Fix It
+
+The only known cause of this issue is manually manipulating `window.history` instead of using `next/router` 
+
+### Useful Links
+
+- [The issue this was reported in: #4994](https://github.com/zeit/next.js/issues/4994)
diff --git a/lib/app.js b/lib/app.js
index 58d2d23a..ce57c0e9 100644
--- a/lib/app.js
+++ b/lib/app.js
@@ -79,7 +79,7 @@ export class Container extends Component {
 
 const warnUrl = execOnce(() => {
   if (process.env.NODE_ENV !== 'production') {
-    warn(`Warning: the 'url' property is deprecated. https://err.sh/next.js/url-deprecated`)
+    warn(`Warning: the 'url' property is deprecated. https://err.sh/zeit/next.js/url-deprecated`)
   }
 })
 
diff --git a/lib/router/index.js b/lib/router/index.js
index 9b3334c2..63997d62 100644
--- a/lib/router/index.js
+++ b/lib/router/index.js
@@ -63,7 +63,7 @@ routerEvents.forEach((event) => {
 })
 
 const warnAboutRouterOnAppUpdated = execOnce(() => {
-  console.warn(`Router.onAppUpdated is removed - visit https://err.sh/next.js/no-on-app-updated-hook for more information.`)
+  console.warn(`Router.onAppUpdated is removed - visit https://err.sh/zeit/next.js/no-on-app-updated-hook for more information.`)
 })
 
 Object.defineProperty(SingletonRouter, 'onAppUpdated', {
diff --git a/lib/router/router.js b/lib/router/router.js
index 072a962a..177457e6 100644
--- a/lib/router/router.js
+++ b/lib/router/router.js
@@ -78,6 +78,11 @@ export default class Router {
     }
 
     const { url, as, options } = e.state
+    if (process.env.NODE_ENV === 'development') {
+      if (typeof url === 'undefined' || typeof as === 'undefined') {
+        console.warn('`popstate` event triggered but `event.state` did not have `url` or `as` https://err.sh/zeit/next.js/popstate-state-empty')
+      }
+    }
     this.replace(url, as, options)
   };
 
@@ -169,7 +174,7 @@ export default class Router {
     const { pathname, query } = parse(url, true)
 
     // If asked to change the current URL we should reload the current page
-    // (not location.reload() but reload getInitalProps and other Next.js stuffs)
+    // (not location.reload() but reload getInitialProps and other Next.js stuffs)
     // We also need to set the method = replaceState always
     // as this should not go into the history (That's how browsers work)
     if (!this.urlIsNew(pathname, query)) {
diff --git a/lib/utils.js b/lib/utils.js
index a36d3e41..8fea5122 100644
--- a/lib/utils.js
+++ b/lib/utils.js
@@ -61,7 +61,7 @@ export async function loadGetInitialProps (Component, ctx) {
   if (process.env.NODE_ENV !== 'production') {
     if (Component.prototype && Component.prototype.getInitialProps) {
       const compName = getDisplayName(Component)
-      const message = `"${compName}.getInitialProps()" is defined as an instance method - visit https://err.sh/next.js/get-inital-props-as-an-instance-method for more information.`
+      const message = `"${compName}.getInitialProps()" is defined as an instance method - visit https://err.sh/zeit/next.js/get-initial-props-as-an-instance-method for more information.`
       throw new Error(message)
     }
   }
diff --git a/test/unit/loadGetInitialProps.test.js b/test/unit/loadGetInitialProps.test.js
index 860e9040..b878e38b 100644
--- a/test/unit/loadGetInitialProps.test.js
+++ b/test/unit/loadGetInitialProps.test.js
@@ -7,7 +7,7 @@ describe('loadGetInitialProps', () => {
       getInitialProps () {}
     }
     const rejectPromise = loadGetInitialProps(TestComponent, {})
-    const error = new Error('"TestComponent.getInitialProps()" is defined as an instance method - visit https://err.sh/next.js/get-inital-props-as-an-instance-method for more information.')
+    const error = new Error('"TestComponent.getInitialProps()" is defined as an instance method - visit https://err.sh/zeit/next.js/get-inital-props-as-an-instance-method for more information.')
     return expect(rejectPromise).rejects.toEqual(error)
   })