diff --git a/Discovery/WSDiscovery.cs b/Discovery/WSDiscovery.cs
index d1ea346..b384ecd 100644
--- a/Discovery/WSDiscovery.cs
+++ b/Discovery/WSDiscovery.cs
@@ -114,6 +114,11 @@ XmlProbeReponse DeserializeResponse(string xml)
 
     IEnumerable<DiscoveryDevice> CreateDevices(XmlProbeReponse response, IPEndPoint remoteEndpoint)
     {
+        if (response?.Body?.ProbeMatches == null)
+        {
+            yield break;
+        }
+
         DiscoveryDevice discoveryDevice;
         foreach (var probeMatch in response.Body.ProbeMatches)
         {