diff --git a/build/app.js b/build/app.js
index 769bf445..151dc430 100644
--- a/build/app.js
+++ b/build/app.js
@@ -230,15 +230,17 @@ capitano.command(actions.deploy);
 update.notify();
 
 plugins.register(/^resin-plugin-(.+)$/).then(function() {
-  var cli;
+  var cli, runCommand;
   cli = capitano.parse(process.argv);
-  return events.trackCommand(cli).then(function() {
+  runCommand = function() {
     var ref, ref1;
     if ((ref = cli.global) != null ? ref.help : void 0) {
       return capitanoExecuteAsync({
         command: "help " + ((ref1 = cli.command) != null ? ref1 : '')
       });
+    } else {
+      return capitanoExecuteAsync(cli);
     }
-    return capitanoExecuteAsync(cli);
-  });
+  };
+  return Promise.all([events.trackCommand(cli), runCommand()]);
 })["catch"](errors.handle);
diff --git a/build/events.js b/build/events.js
index 26731646..1f6b0dfe 100644
--- a/build/events.js
+++ b/build/events.js
@@ -22,7 +22,7 @@ exports.trackCommand = function(capitanoCommand) {
   capitanoStateGetMatchCommandAsync = Promise.promisify(require('capitano').state.getMatchCommand);
   return Promise.props({
     resinUrl: resin.settings.get('resinUrl'),
-    username: resin.auth.whoami(),
+    username: resin.auth.whoami().catchReturn(void 0),
     mixpanel: exports.getLoggerInstance()
   }).then(function(arg) {
     var mixpanel, resinUrl, username;
@@ -45,5 +45,5 @@ exports.trackCommand = function(capitanoCommand) {
         command: capitanoCommand
       });
     });
-  });
+  }).timeout(100).catchReturn();
 };
diff --git a/lib/app.coffee b/lib/app.coffee
index a3026e9f..643c3c73 100644
--- a/lib/app.coffee
+++ b/lib/app.coffee
@@ -203,9 +203,12 @@ update.notify()
 plugins.register(/^resin-plugin-(.+)$/).then ->
 	cli = capitano.parse(process.argv)
 
-	events.trackCommand(cli).then ->
+	runCommand = ->
 		if cli.global?.help
-			return capitanoExecuteAsync(command: "help #{cli.command ? ''}")
-		capitanoExecuteAsync(cli)
+			capitanoExecuteAsync(command: "help #{cli.command ? ''}")
+		else
+			capitanoExecuteAsync(cli)
+
+	Promise.all([events.trackCommand(cli), runCommand()])
 
 .catch(errors.handle)
diff --git a/lib/events.coffee b/lib/events.coffee
index 57de2c87..54b6e6be 100644
--- a/lib/events.coffee
+++ b/lib/events.coffee
@@ -13,7 +13,7 @@ exports.trackCommand = (capitanoCommand) ->
 
 	return Promise.props
 		resinUrl: resin.settings.get('resinUrl')
-		username: resin.auth.whoami()
+		username: resin.auth.whoami().catchReturn(undefined)
 		mixpanel: exports.getLoggerInstance()
 	.then ({ username, resinUrl, mixpanel }) ->
 		return capitanoStateGetMatchCommandAsync(capitanoCommand.command).then (command) ->
@@ -30,3 +30,5 @@ exports.trackCommand = (capitanoCommand) ->
 				resinUrl: resinUrl
 				platform: process.platform
 				command: capitanoCommand
+	.timeout(100)
+	.catchReturn()