diff --git a/lib/device.js b/lib/device.js
index e0eb51a4..d66c3028 100644
--- a/lib/device.js
+++ b/lib/device.js
@@ -1,13 +1,20 @@
 var assert = require('assert')
 
-assert.ok(process.env.ANDROID_SERIAL,
-  'Missing environment variable ANDROID_SERIAL')
+var Promise = require('bluebird')
 
-var log = require('./util/logger')
-  .setGlobalIdentifier(process.env.ANDROID_SERIAL)
-  .createLogger('device')
+var logger = require('./util/logger')
+var log = logger.createLogger('device')
+
+function readSerialNumber() {
+  return Promise.try(function() {
+    assert.ok(process.env.ANDROID_SERIAL,
+      'Missing environment variable ANDROID_SERIAL')
+    return process.env.ANDROID_SERIAL
+  })
+}
 
 function gracefullyExit() {
+  log.info('Bye')
   process.exit(0)
 }
 
@@ -19,4 +26,12 @@ process.on('SIGTERM', function() {
   gracefullyExit()
 })
 
-log.info('Started')
+Promise.spawn(function* () {
+  var serial = yield readSerialNumber()
+
+  // Show serial number in logs
+  logger.setGlobalIdentifier(serial)
+
+  // Report
+  log.info('Started')
+})