diff --git a/homeassistant/components/binary_sensor/nest.py b/homeassistant/components/binary_sensor/nest.py
index d78e33c9f95fc096aa5f99b4843f59578ac69ca7..070703df32a85d823c3f3deedbf61f826b3dee6f 100644
--- a/homeassistant/components/binary_sensor/nest.py
+++ b/homeassistant/components/binary_sensor/nest.py
@@ -60,6 +60,9 @@ _LOGGER = logging.getLogger(__name__)
 
 def setup_platform(hass, config, add_devices, discovery_info=None):
     """Setup Nest binary sensors."""
+    if discovery_info is None:
+        return
+
     nest = hass.data[DATA_NEST]
     conf = config.get(CONF_MONITORED_CONDITIONS, _VALID_BINARY_SENSOR_TYPES)
 
diff --git a/homeassistant/components/camera/nest.py b/homeassistant/components/camera/nest.py
index 8bda0e8eb9cebce353a18b2d989628a38312ca2c..aa2041e07a676ecb25cdb266f6ae74b876d5f6a4 100644
--- a/homeassistant/components/camera/nest.py
+++ b/homeassistant/components/camera/nest.py
@@ -26,6 +26,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     """Set up a Nest Cam."""
     if discovery_info is None:
         return
+
     camera_devices = hass.data[nest.DATA_NEST].camera_devices()
     cameras = [NestCamera(structure, device)
                for structure, device in camera_devices]
diff --git a/homeassistant/components/climate/nest.py b/homeassistant/components/climate/nest.py
index 06ec500f9e2958c333521a626f5ce77928421e20..dbc681625798b5f8939a7cc8d42061c41c530a88 100644
--- a/homeassistant/components/climate/nest.py
+++ b/homeassistant/components/climate/nest.py
@@ -31,10 +31,11 @@ STATE_HEAT_COOL = 'heat-cool'
 
 def setup_platform(hass, config, add_devices, discovery_info=None):
     """Setup the Nest thermostat."""
-    _LOGGER.debug("Setting up nest thermostat")
     if discovery_info is None:
         return
 
+    _LOGGER.debug("Setting up nest thermostat")
+
     temp_unit = hass.config.units.temperature_unit
 
     add_devices(
diff --git a/homeassistant/components/sensor/nest.py b/homeassistant/components/sensor/nest.py
index b4909aebae3b2ba3e388a6ca6e17ab32548f2ae3..53f767ab49454080cfb4e56e1a1d01acfcfb6c46 100644
--- a/homeassistant/components/sensor/nest.py
+++ b/homeassistant/components/sensor/nest.py
@@ -68,6 +68,9 @@ _LOGGER = logging.getLogger(__name__)
 
 def setup_platform(hass, config, add_devices, discovery_info=None):
     """Setup the Nest Sensor."""
+    if discovery_info is None:
+        return
+
     nest = hass.data[DATA_NEST]
     conf = config.get(CONF_MONITORED_CONDITIONS, _VALID_SENSOR_TYPES)