diff --git a/meteor/client/lib/docker.js b/meteor/client/lib/docker.js
index 11610287e7..32ab8ee3da 100644
--- a/meteor/client/lib/docker.js
+++ b/meteor/client/lib/docker.js
@@ -8,18 +8,21 @@ Docker = {};
 
 Docker.DEFAULT_IMAGES_FILENAME = 'base-images-0.0.2.tar.gz';
 Docker.DEFAULT_IMAGES_CHECKSUM = 'a3517ac21034a1969d9ff15e3c41b1e2f1aa83c67b16a8bd0bc378ffefaf573b'; // Sha256 Checksum
-Docker.CERT_DIR = path.join(process.env[(process.platform === 'win32') ? 'USERPROFILE' : 'HOME'], '.boot2docker/certs/kitematic-vm');
 Docker.HOST_IP = '192.168.60.103';
 Docker.HOST_PORT = '2376';
 
 Docker.client = function () {
+  var certDir = path.join(process.env[(process.platform === 'win32') ? 'USERPROFILE' : 'HOME'], '.boot2docker/certs/kitematic-vm');
+  if (!fs.existsSync(certDir)) {
+    return null;
+  }
   return new Dockerode({
     protocol: 'https',
     host: Docker.HOST_IP,
     port: Docker.HOST_PORT,
-    ca: fs.readFileSync(path.join(Docker.CERT_DIR, 'ca.pem')),
-    cert: fs.readFileSync(path.join(Docker.CERT_DIR, 'cert.pem')),
-    key: fs.readFileSync(path.join(Docker.CERT_DIR, 'key.pem'))
+    ca: fs.readFileSync(path.join(certDir, 'ca.pem')),
+    cert: fs.readFileSync(path.join(certDir, 'cert.pem')),
+    key: fs.readFileSync(path.join(certDir, 'key.pem'))
   });
 };
 
diff --git a/meteor/client/lib/router.js b/meteor/client/lib/router.js
index e3ce718005..c3bbef1d6b 100755
--- a/meteor/client/lib/router.js
+++ b/meteor/client/lib/router.js
@@ -70,7 +70,6 @@ Router.map(function () {
             // There's an install but it's lower than the current version, re-run as an 'update'.
             Session.set('isUpdating', true);
           }
-          Session.set('installing', true);
           this.redirect('/setup/intro');
         } else {
           this.redirect('/apps');