Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

1 files changed, 13 insertions, 2 deletions

diff --git a/MediaBrowser.Server.Implementations/Localization/LocalizationManager.cs b/MediaBrowser.Server.Implementations/Localization/LocalizationManager.cs
index 1a85d9133..3672afbc2 100644
--- a/MediaBrowser.Server.Implementations/Localization/LocalizationManager.cs
+++ b/MediaBrowser.Server.Implementations/Localization/LocalizationManager.cs
@@ -125,7 +125,18 @@ namespace MediaBrowser.Server.Implementations.Localization
         public IEnumerable<CountryInfo> GetCountries()
         {
             return CultureInfo.GetCultures(CultureTypes.SpecificCultures)
-                .Select(c => new RegionInfo(c.LCID))
+                .Select(c =>
+                {
+                    try
+                    {
+                        return new RegionInfo(c.LCID);
+                    }
+                    catch (CultureNotFoundException)
+                    {
+                        return null;
+                    }
+                })
+                .Where(i => i != null)
                 .OrderBy(c => c.DisplayName)
                 .DistinctBy(c => c.TwoLetterISORegionName)
                 .Select(c => new CountryInfo
@@ -356,7 +367,7 @@ namespace MediaBrowser.Server.Implementations.Localization
             }.OrderBy(i => i.Name);
         }
 
-        public string LocalizeDocument(string document, string culture, Func<string,string> tokenBuilder)
+        public string LocalizeDocument(string document, string culture, Func<string, string> tokenBuilder)
         {
             foreach (var pair in GetLocalizationDictionary(culture).ToList())
             {