Merge branch 'dev' of https://github.com/MediaBrowser/Emby into dev

MediaBrowser.Server.Implementations/Connect/ConnectManager.cs

@@ -65,12 +65,11 @@ namespace MediaBrowser.Server.Implementations.Connect
 
                 if (!string.IsNullOrWhiteSpace(address))
                 {
-                    try
+                    Uri newUri;
-                    {
+
-                        address = new Uri(address).Host;
+                    if (Uri.TryCreate(address, UriKind.Absolute, out newUri))
-                    }
-                    catch
                     {
+                        address = newUri.Host;
                     }
                 }