diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/DnsServers/DnsServerController.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/DnsServers/DnsServerController.cs
index 44ec6c81..b9df1602 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/DnsServers/DnsServerController.cs
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/DnsServers/DnsServerController.cs
@@ -42,6 +42,7 @@ namespace WebsitePanel.EnterpriseServer
     {
         private static string GetAsciiZoneName(string zoneName)
         {
+            if (string.IsNullOrEmpty(zoneName)) return zoneName;
             var idn = new IdnMapping();
             return idn.GetAscii(zoneName);
         }
diff --git a/WebsitePanel/Sources/WebsitePanel.Server/DNSServer.asmx.cs b/WebsitePanel/Sources/WebsitePanel.Server/DNSServer.asmx.cs
index a4f26d8a..7c15bdf7 100644
--- a/WebsitePanel/Sources/WebsitePanel.Server/DNSServer.asmx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.Server/DNSServer.asmx.cs
@@ -54,6 +54,7 @@ namespace WebsitePanel.Server
 
         private string GetAsciiZoneName(string zoneName)
         {
+            if (string.IsNullOrEmpty(zoneName)) return zoneName;
             var idn = new IdnMapping();
             return idn.GetAscii(zoneName);
         }