diff --git a/bin/next-start b/bin/next-start
index 23a915368005af828510e3ebab47145105d59ae7..854a11e9b26714cbeb0f070bbb28398bc7f88919 100755
--- a/bin/next-start
+++ b/bin/next-start
@@ -14,9 +14,15 @@ const argv = parseArgs(process.argv.slice(2), {
     p: 'port'
   },
   boolean: ['h'],
+  string: ['H'],
   default: { p: 3000 }
 })
 
+if (argv.hostname === '') {
+  console.error(`> Provided hostname argument has no value`)
+  process.exit(1)
+}
+
 if (argv.help) {
   console.log(`
     Description
@@ -50,11 +56,10 @@ if (!existsSync(resolve(dir, '.next', 'BUILD_ID'))) {
 srv.start(argv.port, argv.hostname)
 .then(() => {
   if (!process.env.NOW) {
-    console.log(`> Ready on http://${argv.hostname && typeof argv.hostname !== 'boolean' ? argv.hostname : 'localhost'}:${argv.port}`)
+    console.log(`> Ready on http://${argv.hostname ? argv.hostname : 'localhost'}:${argv.port}`)
   }
 })
 .catch((err) => {
   console.error(err)
   process.exit(1)
 })
-
diff --git a/server/index.js b/server/index.js
index aa82c130d7bb35ca96a53db7a91f0ffffadd7d0a..e14aefaae260363a0e89df9bff3af0f633b1799f 100644
--- a/server/index.js
+++ b/server/index.js
@@ -130,11 +130,7 @@ export default class Server {
       // This code catches EADDRINUSE error if the port is already in use
       this.http.on('error', reject)
       this.http.on('listening', () => resolve())
-      if (hostname && typeof hostname !== 'boolean') {
-        this.http.listen(port, hostname)
-      } else {
-        this.http.listen(port)
-      }
+      this.http.listen(port, hostname)
     })
   }