diff --git a/salt/utils/ssdp.py b/salt/utils/ssdp.py
index <HASH>..<HASH> 100644
--- a/salt/utils/ssdp.py
+++ b/salt/utils/ssdp.py
@@ -380,12 +380,12 @@ class SSDPDiscoveryClient(SSDPBase):
 
         :return:
         '''
-        self.log.info("Looking for a server discovery")
         response = {}
-        try:
-            self._query()
-            self._collect_masters_map(response)
-        except socket.timeout:
+        masters = {}
+        self.log.info("Looking for a server discovery")
+        self._query()
+        self._collect_masters_map(response)
+        if not response:
             msg = 'No master has been discovered.'
             self.log.info(msg)
         masters = {}
Bugfix for refactoring: the exception was never raised anyway