Correcting logic to find the host

Author: StanleyGoldman

src/UnityExtension/Assets/Editor/GitHub.Unity/UI/AuthenticationView.cs

@@ -34,9 +34,16 @@ private AuthenticationService AuthenticationService
             {
                 if (authenticationService == null)
                 {
-                    var host = Repository != null
-                        ? new UriString(Repository.CloneUrl.ToRepositoryUri().GetComponents(UriComponents.SchemeAndServer, UriFormat.SafeUnescaped))
-                        : UriString.ToUriString(HostAddress.GitHubDotComHostAddress.WebUri);
+                    UriString host;
+                    if (Repository != null && Repository.CloneUrl != null && Repository.CloneUrl.IsValidUri)
+                    {
+                        host = new UriString(Repository.CloneUrl.ToRepositoryUri()
+                            .GetComponents(UriComponents.SchemeAndServer, UriFormat.SafeUnescaped));
+                    }
+                    else
+                    {
+                        host = UriString.ToUriString(HostAddress.GitHubDotComHostAddress.WebUri);
+                    }
 
                     AuthenticationService = new AuthenticationService(host, new AppConfiguration(), Platform.Keychain);
                 }

src/UnityExtension/Assets/Editor/GitHub.Unity/UI/Window.cs

@@ -223,9 +223,16 @@ private void GoToProfile(object obj)
         }
         private void SignOut(object obj)
         {
-            var host = Repository != null
-                ? new UriString(Repository.CloneUrl.ToRepositoryUri().GetComponents(UriComponents.SchemeAndServer, UriFormat.SafeUnescaped))
-                : UriString.ToUriString(HostAddress.GitHubDotComHostAddress.WebUri);
+            UriString host;
+            if (Repository != null && Repository.CloneUrl != null && Repository.CloneUrl.IsValidUri)
+            {
+                host = new UriString(Repository.CloneUrl.ToRepositoryUri()
+                                               .GetComponents(UriComponents.SchemeAndServer, UriFormat.SafeUnescaped));
+            }
+            else
+            {
+                host = UriString.ToUriString(HostAddress.GitHubDotComHostAddress.WebUri);
+            }
 
             var apiClient = ApiClient.Create(host, Platform.Keychain, new AppConfiguration());
             apiClient.Logout(host);