diff --git a/Discovery/WSDiscovery.cs b/Discovery/WSDiscovery.cs
index d1ea346..567ea8a 100644
--- a/Discovery/WSDiscovery.cs
+++ b/Discovery/WSDiscovery.cs
@@ -65,6 +65,14 @@ public async Task<IEnumerable<DiscoveryDevice>> Discover(int Timeout, IUdpClient
         {
             isRunning = false;
         }
+        catch (ObjectDisposedException)
+        {
+            isRunning = false;
+        }
+        catch (SocketException)
+        {
+            isRunning = false;
+        }
         finally
         {
             client.Close();