@@ -138,7 +138,7 @@ export OPENSHIFT_PROFILE="${CLI_PROFILE-}"

 #

 # test client not configured

-[ "$(osc get services 2>&1 | grep 'no server found')" ]

+[ "$(osc get services 2>&1 | grep 'Error in configuration')" ]

 # Set KUBERNETES_MASTER for osc from now on

 export KUBERNETES_MASTER="${API_SCHEME}://${API_HOST}:${API_PORT}"

@@ -4,6 +4,7 @@ import (

 	"strings"

 	kerrors "github.com/GoogleCloudPlatform/kubernetes/pkg/api/errors"

+	"github.com/GoogleCloudPlatform/kubernetes/pkg/client/clientcmd"

 )

 const (

@@ -53,8 +54,7 @@ func detectReason(err error) int {

 		switch {

 		case strings.Contains(err.Error(), "certificate signed by unknown authority"):

 			return certificateAuthorityUnknownReason

-

-		case strings.Contains(err.Error(), "no server found for"):

+		case clientcmd.IsConfigurationInvalid(err), strings.Contains(err.Error(), "no server found for"):

 			return noServerFoundReason

 		}

 	}