diff --git a/src/ContainerHomeLogs.react.js b/src/ContainerHomeLogs.react.js
index 4a471202ff..fba6a1b4f4 100644
--- a/src/ContainerHomeLogs.react.js
+++ b/src/ContainerHomeLogs.react.js
@@ -23,6 +23,10 @@ module.exports = React.createClass({
     LogStore.fetch(this.props.container.Name);
   },
   componentWillUnmount: function() {
+    if (!this.props.container) {
+      return;
+    }
+
     LogStore.detach(this.props.container.Name);
     LogStore.removeListener(LogStore.SERVER_LOGS_EVENT, this.update);
   },
diff --git a/src/SetupStore.js b/src/SetupStore.js
index c4bab1ff0c..53972c90d7 100644
--- a/src/SetupStore.js
+++ b/src/SetupStore.js
@@ -80,7 +80,7 @@ var _steps = [{
     var isoversion = machine.isoversion();
     var packagejson = util.packagejson();
     if (!isoversion || setupUtil.compareVersions(isoversion, packagejson['docker-version']) < 0) {
-      yield machine.stop();
+      yield machine.start();
       yield machine.upgrade();
     }
     if ((yield machine.state()) !== 'Running') {