diff --git a/README.md b/README.md
index 0372efb24a..fa9cf1c083 100644
--- a/README.md
+++ b/README.md
@@ -49,7 +49,7 @@ So far, we get:
 - Automatic transpilation and bundling (with webpack and babel)
 - Hot code reloading
 - Server rendering and indexing of `./pages`
-- Static file serving. `./static/` is mapped to `/static/`
+- Static file serving. `./static/` is mapped to `/`
 - Config file `nuxt.config.js`
 - Code splitting via webpack
 
@@ -97,8 +97,13 @@ This is mostly used for tests purpose but who knows!
 
 ```js
 nuxt.renderRoute('/about', context)
-.then(function (html) {
-  // HTML
+.then(function ({ html, error }) {
+  // You can check error to know if your app displayed the error page for this route
+  // Useful to set the correct status status code if an error appended:
+  if (error) {
+    return res.status(error.statusCode || 500).send(html)
+  }
+  res.send(html)
 })
 .catch(function (error) {
   // And error appended while rendering the route
diff --git a/bin/nuxt-build b/bin/nuxt-build
index b20a727b15..780c3fe3d8 100755
--- a/bin/nuxt-build
+++ b/bin/nuxt-build
@@ -23,5 +23,5 @@ new Nuxt(options)
 })
 .catch((err) => {
   console.error(err)
-  process.exit()
+  process.exit(1)
 })
diff --git a/bin/nuxt-dev b/bin/nuxt-dev
index 069e62aaf0..d772cd4b67 100755
--- a/bin/nuxt-dev
+++ b/bin/nuxt-dev
@@ -15,6 +15,8 @@ if (typeof options.rootDir !== 'string') {
   options.rootDir = rootDir
 }
 
+options.dev = true // Add hot reloading and watching changes
+
 new Nuxt(options)
 .then((nuxt) => {
   new Server(nuxt)
@@ -22,5 +24,5 @@ new Nuxt(options)
 })
 .catch((err) => {
   console.error(err)
-  process.exit()
+  process.exit(1)
 })
diff --git a/bin/nuxt-start b/bin/nuxt-start
index 1ef5bdd692..b0e0f23820 100755
--- a/bin/nuxt-start
+++ b/bin/nuxt-start
@@ -25,5 +25,5 @@ new Nuxt(options)
 })
 .catch((err) => {
   console.error(err)
-  process.exit()
+  process.exit(1)
 })
diff --git a/examples/hello-world/pages/about.vue b/examples/hello-world/pages/about.vue
index 934bfbfe09..10b34ee7f8 100755
--- a/examples/hello-world/pages/about.vue
+++ b/examples/hello-world/pages/about.vue
@@ -1,15 +1,25 @@
 <template>
   <div class="container">
-    <img src="/static/nuxt.png" />
-    <h2>About</h2>
-    <p><router-link to="/">Home</router-link></p>
+    <img src="/nuxt-square.png" />
+    <h2>Thank you for testing nuxt.js</h2>
+    <p><router-link to="/">Back home</router-link></p>
   </div>
 </template>
 
 <style scoped>
 .container {
-  font-family: serif;
-  margin-top: 200px;
+  position: absolute;
+  top: 0;
+  left: 0;
+  height: 100%;
+  width: 100%;
+  background: black;
+  color: white;
+  font-family: "Lucida Console", Monaco, monospace;
+  padding-top: 130px;
   text-align: center;
 }
+a {
+  color: silver;
+}
 </style>
diff --git a/examples/hello-world/pages/index.vue b/examples/hello-world/pages/index.vue
index 52c820e2d7..83731c889d 100755
--- a/examples/hello-world/pages/index.vue
+++ b/examples/hello-world/pages/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="container">
-    <img src="/static/nuxt.png" />
+    <img src="/nuxt.png" />
     <h2>Hello World.</h2>
     <p><router-link to="/about">About</router-link></p>
   </div>
diff --git a/examples/hello-world/static/nuxt-square.png b/examples/hello-world/static/nuxt-square.png
new file mode 100644
index 0000000000..4ef326eca3
Binary files /dev/null and b/examples/hello-world/static/nuxt-square.png differ
diff --git a/examples/with-ava/test/index.test.js b/examples/with-ava/test/index.test.js
index 7869688653..ccaef820e6 100755
--- a/examples/with-ava/test/index.test.js
+++ b/examples/with-ava/test/index.test.js
@@ -40,6 +40,13 @@ async function renderAndGetWindow (route) {
       },
       done (err, window) {
         if (err) return reject(err)
+        // If Nuxt could not be loaded (error from the server-side)
+        if (!window.__NUXT__) {
+          return reject({
+            message: 'Could not load the nuxt app',
+            body: window.document.getElementsByTagName('body')[0].innerHTML
+          })
+        }
         // Used by nuxt.js to say when the components are loaded and the app ready
         window.onNuxtReady = function () {
           resolve(window)
@@ -54,7 +61,7 @@ async function renderAndGetWindow (route) {
 */
 test('Route / exits and render HTML', async t => {
   let context = {}
-  const html = await nuxt.renderRoute('/', context)
+  const { html } = await nuxt.renderRoute('/', context)
   t.true(html.includes('<p class="red-color">Hello world!</p>'))
   t.is(context.nuxt.error, null)
   t.is(context.nuxt.data[0].name, 'world')
diff --git a/lib/build/index.js b/lib/build/index.js
index 2e0813c0ba..4f211f5184 100644
--- a/lib/build/index.js
+++ b/lib/build/index.js
@@ -52,6 +52,10 @@ module.exports = function * () {
   if (noBuild) {
     const serverConfig = getWebpackServerConfig.call(this)
     const bundlePath = join(serverConfig.output.path, serverConfig.output.filename)
+    if (!fs.existsSync(bundlePath)) {
+      console.error('> No build files found, please run `nuxt build` before launching `nuxt start`')
+      process.exit(1)
+    }
     createRenderer.call(this, fs.readFileSync(bundlePath, 'utf8'))
     return Promise.resolve()
   }
@@ -64,15 +68,15 @@ module.exports = function * () {
     } else {
       console.error('> Couldn\'t find a `pages` directory. Please create one under the project root')
     }
-    process.exit()
+    process.exit(1)
   }
   if (this.options.store && !fs.existsSync(join(this.dir, 'store'))) {
     console.error('> No `store` directory found (store option activated). Please create on under the project root')
-    process.exit()
+    process.exit(1)
   }
   if (this.options.store && !fs.existsSync(join(this.dir, 'store', 'index.js'))) {
     console.error('> No `store/index.js` file found (store option activated). Please create the file.')
-    process.exit()
+    process.exit(1)
   }
   debug(`App root: ${this.dir}`)
   debug('Generating .nuxt/ files...')
diff --git a/lib/nuxt.js b/lib/nuxt.js
index 92014d4dbd..cb704eaacd 100644
--- a/lib/nuxt.js
+++ b/lib/nuxt.js
@@ -44,8 +44,11 @@ class Nuxt {
     })
     // renderer used by Vue.js (via createBundleRenderer)
     this.renderer = null
+    // For serving static/ files to /
+    this.serveStatic = pify(serveStatic(resolve(this.dir, 'static')))
     // For serving .nuxt/dist/ files
-    this.serveStatic = pify(serveStatic(resolve(this.dir, '.nuxt', 'dist')))
+    this._nuxtRegexp = /^\/_nuxt\//
+    this.serveStaticNuxt = pify(serveStatic(resolve(this.dir, '.nuxt', 'dist')))
     // Add this.build
     this.build = build.bind(this)
     // Launch build and set this.renderer
@@ -74,25 +77,27 @@ class Nuxt {
         // Call webpack middlewares only in development
         yield self.webpackDevMiddleware(req, res)
         yield self.webpackHotMiddleware(req, res)
-        return
       }
-      if (req.url.includes('/_nuxt/')) {
+      // Serve static/ files
+      yield self.serveStatic(req, res)
+      // Serve .nuxt/dist/ files (only for production)
+      if (!self.dev && self._nuxtRegexp.test(req.url)) {
         const url = req.url
-        req.url = req.url.replace('/_nuxt/', '/')
-        yield self.serveStatic(req, res)
+        req.url = req.url.replace(self._nuxtRegexp, '/')
+        yield self.serveStaticNuxt(req, res)
         req.url = url
       }
     })
     .then(() => {
-      if (this.dev && req.url.includes('/_nuxt/') && req.url.includes('.hot-update.json')) {
+      if (this.dev && this._nuxtRegexp.test(req.url) && req.url.includes('.hot-update.json')) {
         res.statusCode = 404
         return res.end()
       }
       return this.renderRoute(req.url, context)
     })
-    .then((html) => {
-      if (context.nuxt.error && context.nuxt.error.statusCode) {
-        res.statusCode = context.nuxt.error.statusCode
+    .then(({ html, error }) => {
+      if (error) {
+        res.statusCode = context.nuxt.error.statusCode || 500
       }
       res.end(html, 'utf8')
     })
@@ -110,13 +115,13 @@ class Nuxt {
     // Call rendertoSting from the bundleRenderer and generate the HTML (will update the context as well)
     const self = this
     return co(function * () {
-      const html = yield self.renderToString(context)
+      const app = yield self.renderToString(context)
       if (context.nuxt && context.nuxt.error instanceof Error) {
         context.nuxt.error = { statusCode: 500, message: context.nuxt.error.message }
       }
-      const app = self.appTemplate({
+      const html = self.appTemplate({
         dev: self.dev, // Use to add the extracted CSS <link> in production
-        APP: html,
+        APP: app,
         context: context,
         files: {
           css: join('/_nuxt/', self.options.build.filenames.css),
@@ -124,7 +129,7 @@ class Nuxt {
           app: join('/_nuxt/', self.options.build.filenames.app)
         }
       })
-      return app
+      return { html, error: context.nuxt.error }
     })
   }
 
diff --git a/lib/server.js b/lib/server.js
index af58bd2fed..e75a24aaf0 100644
--- a/lib/server.js
+++ b/lib/server.js
@@ -1,41 +1,14 @@
 'use strict'
 
 const http = require('http')
-const co = require('co')
-const pify = require('pify')
-const serveStatic = require('serve-static')
-const { resolve } = require('path')
 
 class Server {
 
   constructor (nuxt) {
-    this.server = http.createServer(this.handle.bind(this))
-    this.serveStatic = pify(serveStatic(resolve(nuxt.dir, 'static')))
-    this.nuxt = nuxt
+    this.server = http.createServer(nuxt.render.bind(nuxt))
     return this
   }
 
-  handle (req, res) {
-    const method = req.method.toUpperCase()
-    const self = this
-
-    if (method !== 'GET' && method !== 'HEAD') {
-      return this.nuxt.render(req, res)
-    }
-    co(function * () {
-      if (req.url.includes('/static/')) {
-        const url = req.url
-        req.url = req.url.replace('/static/', '/')
-        yield self.serveStatic(req, res)
-        req.url = url
-      }
-    })
-    .then(() => {
-      // File not found
-      this.nuxt.render(req, res)
-    })
-  }
-
   listen (port, host) {
     host = host || 'localhost'
     port = port || 3000
diff --git a/package.json b/package.json
index fa4e6643d0..620f1d0fd9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nuxt",
-  "version": "0.2.6",
+  "version": "0.3.0",
   "description": "A minimalistic framework for server-rendered Vue.js applications (inspired by Next.js)",
   "main": "index.js",
   "license": "MIT",