diff --git a/Netch/Models/Server.cs b/Netch/Models/Server.cs index 15ffbd75..3bf89853 100644 --- a/Netch/Models/Server.cs +++ b/Netch/Models/Server.cs @@ -156,25 +156,32 @@ namespace Netch.Models if (Country == null) { - var databaseReader = new DatabaseReader("bin\\GeoLite2-Country.mmdb"); - - if (IPAddress.TryParse(Hostname, out _) == true) + try { - Country = databaseReader.Country(Hostname).Country.IsoCode; - } - else - { - var DnsResult = DNS.Lookup(Hostname); + var databaseReader = new DatabaseReader("bin\\GeoLite2-Country.mmdb"); - if (DnsResult != null) + if (IPAddress.TryParse(Hostname, out _) == true) { - Country = databaseReader.Country(DnsResult).Country.IsoCode; + Country = databaseReader.Country(Hostname).Country.IsoCode; } else { - Country = "UN"; + var DnsResult = DNS.Lookup(Hostname); + + if (DnsResult != null) + { + Country = databaseReader.Country(DnsResult).Country.IsoCode; + } + else + { + Country = "UN"; + } } } + catch (Exception) + { + Country = "UN"; + } } Group = Group.Equals("None") ? Group.ToUpper() : Group;