diff --git a/src/fprime_gds/common/communication/adapters/ip.py b/src/fprime_gds/common/communication/adapters/ip.py
index 0a964f2d..f22ce6d1 100644
--- a/src/fprime_gds/common/communication/adapters/ip.py
+++ b/src/fprime_gds/common/communication/adapters/ip.py
@@ -202,7 +202,12 @@ def check_arguments(cls, address, port, server=True):
 
         :param args: arguments as dictionary
         """
-        check_port(address, port)
+        try:
+            if server:
+                check_port(address, port)
+        except OSError as os_error:
+            raise ValueError(f"{os_error}")
+
 
 
 class IpHandler(abc.ABC):