diff --git a/meteor/client/lib/setup.js b/meteor/client/lib/setup.js
index bda23abf52..564da63fa0 100644
--- a/meteor/client/lib/setup.js
+++ b/meteor/client/lib/setup.js
@@ -93,8 +93,7 @@ Setup.steps = [
             callback('Boot2Docker SSH key doesn\'t exist. Fix by removing the existing Boot2Docker VM and re-run the installer. This usually occurs because an old version of Boot2Docker is installed.');
           } else {
             Boot2Docker.vmUpToDate(function (err, upToDate) {
-              if (err) {callback(err); return;}
-              if (!upToDate) {
+              if (err || !upToDate) {
                 Boot2Docker.stop(function(err) {
                   Boot2Docker.upgrade(function (err) {
                     callback(err);
@@ -104,7 +103,7 @@ Setup.steps = [
                 callback();
               }
             });
-          } 
+          }
         }
       });
     },
diff --git a/meteor/client/lib/virtualbox.js b/meteor/client/lib/virtualbox.js
index 17ed9066a2..85cf36893f 100644
--- a/meteor/client/lib/virtualbox.js
+++ b/meteor/client/lib/virtualbox.js
@@ -16,7 +16,7 @@ VirtualBox.installed = function () {
 };
 
 VirtualBox.exec = function (command, callback) {
-  exec(['/usr/bin/VBoxManage', command], function (stderr, stdout, code) {
+  exec('/usr/bin/VBoxManage ' + command, function (stderr, stdout, code) {
     callback(stderr, stdout, code);
   });
 };
@@ -115,4 +115,4 @@ VirtualBox.shutdownVM = function (name, callback) {
       });
     });
   });
-};
\ No newline at end of file
+};