diff --git a/plugins/sdr_sources/remote_sdr_support/plugin/remote_source.cpp b/plugins/sdr_sources/remote_sdr_support/plugin/remote_source.cpp
index ea6e1d1d0..9aad6adbd 100644
--- a/plugins/sdr_sources/remote_sdr_support/plugin/remote_source.cpp
+++ b/plugins/sdr_sources/remote_sdr_support/plugin/remote_source.cpp
@@ -162,7 +162,15 @@ std::vector<dsp::SourceDescriptor> RemoteSource::getAvailableSources()
 
     service_discovery::UDPDiscoveryConfig cfg = {REMOTE_NETWORK_DISCOVERY_REQPORT, REMOTE_NETWORK_DISCOVERY_REPPORT, REMOTE_NETWORK_DISCOVERY_REQPKT, REMOTE_NETWORK_DISCOVERY_REPPKT};
 
-    auto detected_servers = service_discovery::discoverUDPServers(cfg, 100);
+    std::vector<std::pair<std::string, int>> detected_servers;
+    try
+    {
+        detected_servers = service_discovery::discoverUDPServers(cfg, 100);
+    }
+    catch(std::exception &e)
+    {
+        logger->trace("Error on Remote SDR Discovery - " + std::string(e.what()));
+    }
     detected_servers.insert(detected_servers.end(), additional_servers.begin(), additional_servers.end());
 
     for (auto server_ip : detected_servers)
diff --git a/plugins/sdr_sources/remote_sdr_support/udp_discovery.cpp b/plugins/sdr_sources/remote_sdr_support/udp_discovery.cpp
index fdc95b3c9..23397c8b3 100644
--- a/plugins/sdr_sources/remote_sdr_support/udp_discovery.cpp
+++ b/plugins/sdr_sources/remote_sdr_support/udp_discovery.cpp
@@ -269,12 +269,7 @@ namespace service_discovery
         std::thread funrx_th(fun_rx);
 
         std::this_thread::sleep_for(std::chrono::milliseconds(10));
-        try {
-            sendUdpBroadcast(cfg.req_port, cfg.req_pkt.data(), cfg.req_pkt.size());
-        }
-        catch (std::exception &e) {
-            logger->trace("Error on Remote SDR Discovery - " + std::string(e.what()));
-        }
+        sendUdpBroadcast(cfg.req_port, cfg.req_pkt.data(), cfg.req_pkt.size());
 
         std::this_thread::sleep_for(std::chrono::milliseconds(wait_millis));
         should_wait = false; // Force close with a new packet