diff --git a/bin/next-build b/bin/next-build
index 4e11988906e81ec78ab22f10e67bc3f53fcebc1c..e52d0ce35e82a767e37d5bedbc18d2cb66330308 100755
--- a/bin/next-build
+++ b/bin/next-build
@@ -1,6 +1,7 @@
 #!/usr/bin/env node
 
-import { resolve } from 'path'
+import { resolve, join } from 'path'
+import { exists } from 'mz/fs'
 import parseArgs from 'minimist'
 import build from '../server/build'
 
@@ -27,6 +28,23 @@ if (argv.help) {
 
 const dir = resolve(argv._[0] || '.')
 
+// Check if pages dir exists and warn if not
+exists(dir)
+.then(async () => {
+  if (!(await exists(join(dir, 'pages')))) {
+    if (await exists(join(dir, '..', 'pages'))) {
+      console.error('> No `pages` directory found. Did you mean to run `next` in the parent (`../`) directory?')
+    } else {
+      console.error('> Couldn\'t find a `pages` directory. Please create one under the project root')
+    }
+    process.exit(1)
+  }
+})
+.catch((err) => {
+  console.error(err)
+  process.exit(1)
+})
+
 build(dir)
 .catch((err) => {
   console.error(err)
diff --git a/bin/next-dev b/bin/next-dev
index 748307c70f41afc6b4119a10343a7214b62efef1..4c86f50206f87b7ec593411c65ca4192317f1c0b 100755
--- a/bin/next-dev
+++ b/bin/next-dev
@@ -37,14 +37,9 @@ if (argv.help) {
 
 const dir = resolve(argv._[0] || '.')
 
-const srv = new Server({ dir, dev: true })
-srv.start(argv.port)
+// Check if pages dir exists and warn if not
+exists(dir)
 .then(async () => {
-  if (!process.env.NOW) {
-    console.log(`> Ready on http://localhost:${argv.port}`)
-  }
-
-  // Check if pages dir exists and warn if not
   if (!(await exists(join(dir, 'pages')))) {
     if (await exists(join(dir, '..', 'pages'))) {
       console.error('> No `pages` directory found. Did you mean to run `next` in the parent (`../`) directory?')
@@ -58,3 +53,15 @@ srv.start(argv.port)
   console.error(err)
   process.exit(1)
 })
+
+const srv = new Server({ dir, dev: true })
+srv.start(argv.port)
+.then(async () => {
+  if (!process.env.NOW) {
+    console.log(`> Ready on http://localhost:${argv.port}`)
+  }
+})
+.catch((err) => {
+  console.error(err)
+  process.exit(1)
+})