diff --git a/homeassistant/components/discovery.py b/homeassistant/components/discovery.py
index 195203e8134..e5292e3ee70 100644
--- a/homeassistant/components/discovery.py
+++ b/homeassistant/components/discovery.py
@@ -11,7 +11,6 @@ import logging
 import threading
 
 # pylint: disable=no-name-in-module, import-error
-from homeassistant.external.netdisco.netdisco import DiscoveryService
 import homeassistant.external.netdisco.netdisco.const as services
 
 from homeassistant import bootstrap
@@ -52,12 +51,19 @@ def listen(hass, service, callback):
 
 def setup(hass, config):
     """ Starts a discovery service. """
+    logger = logging.getLogger(__name__)
+
+    try:
+        from homeassistant.external.netdisco.netdisco import DiscoveryService
+    except ImportError:
+        logger.exception(
+            "Unable to import netdisco. "
+            "Did you install all the zeroconf dependency?")
+        return False
 
     # Disable zeroconf logging, it spams
     logging.getLogger('zeroconf').setLevel(logging.CRITICAL)
 
-    logger = logging.getLogger(__name__)
-
     lock = threading.Lock()
 
     def new_service_listener(service, info):
diff --git a/homeassistant/external/netdisco b/homeassistant/external/netdisco
index 68877783cb9..6e712dd65e4 160000
--- a/homeassistant/external/netdisco
+++ b/homeassistant/external/netdisco
@@ -1 +1 @@
-Subproject commit 68877783cb989b874cbcaec5f388a8a4345891a6
+Subproject commit 6e712dd65e474bf623b35c54f5290dbac192c7e4