diff --git a/TechnitiumLibrary.Net/DomainEndPoint.cs b/TechnitiumLibrary.Net/DomainEndPoint.cs
index b911a584..5dc78c8e 100644
--- a/TechnitiumLibrary.Net/DomainEndPoint.cs
+++ b/TechnitiumLibrary.Net/DomainEndPoint.cs
@@ -61,6 +61,12 @@ private DomainEndPoint()
 
         public static bool TryParse(string value, out DomainEndPoint ep)
         {
+            if (string.IsNullOrWhiteSpace(value))
+            {
+                ep = null;
+                return false;
+            }
+
             string[] parts = value.Split(':');
             if (parts.Length > 2)
             {
diff --git a/TechnitiumLibrary.Net/NetworkAddress.cs b/TechnitiumLibrary.Net/NetworkAddress.cs
index 918a7fba..5a823635 100644
--- a/TechnitiumLibrary.Net/NetworkAddress.cs
+++ b/TechnitiumLibrary.Net/NetworkAddress.cs
@@ -1,6 +1,7 @@
 /*
 Technitium Library
 Copyright (C) 2024  Shreyas Zare (shreyas@technitium.com)
+Copyright (C) 2026  Zafer Balkan (zafer@zaferbalkan.com)
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by