diff --git a/resourcehandler/cloudproviderhandler.go b/resourcehandler/cloudproviderhandler.go
index 26e49761..aa101766 100644
--- a/resourcehandler/cloudproviderhandler.go
+++ b/resourcehandler/cloudproviderhandler.go
@@ -26,8 +26,14 @@ func initCloudProvider() ICloudProvider {
 
 	switch getCloudProvider() {
 	case "gke", "gcp":
+		if isEnvVars() {
+			return NewGKEProviderEnvVar()
+		}
 		return NewGKEProviderContext()
 	case "eks", "aws":
+		if isEnvVars() {
+			return NewEKSProviderEnvVar()
+		}
 		return NewEKSProviderContext()
 	}
 	return NewEmptyCloudProvider()
diff --git a/resourcehandler/gkesupport.go b/resourcehandler/gkesupport.go
index 9ed961e1..0dda579e 100644
--- a/resourcehandler/gkesupport.go
+++ b/resourcehandler/gkesupport.go
@@ -41,7 +41,7 @@ func (gkeProvider *GKEProviderEnvVar) getProjectForGKE(cluster string) (string,
 	}
 	parsedName := strings.Split(cluster, "_")
 	if len(parsedName) < 3 {
-		return "", fmt.Errorf("error: failed to parse cluster name")
+		return "", fmt.Errorf("failed to parse project name from cluster name: '%s'", cluster)
 	}
 	project = parsedName[1]
 	return project, nil
@@ -54,7 +54,7 @@ func (gkeProvider *GKEProviderEnvVar) getRegionForGKE(cluster string) (string, e
 	}
 	parsedName := strings.Split(cluster, "_")
 	if len(parsedName) < 3 {
-		return "", fmt.Errorf("error: failed to parse cluster name")
+		return "", fmt.Errorf("failed to parse region name from cluster name: '%s'", cluster)
 	}
 	region = parsedName[2]
 	return region, nil
@@ -117,7 +117,7 @@ func (gkeProviderContext *GKEProviderContext) getProject(cluster string, provide
 func (gkeProviderContext *GKEProviderContext) getProjectForGKE(cluster string) (string, error) {
 	parsedName := strings.Split(cluster, "_")
 	if len(parsedName) < 3 {
-		return "", fmt.Errorf("error: failed to parse cluster name")
+		return "", fmt.Errorf("failed to parse project name from cluster name: '%s'", cluster)
 	}
 	project := parsedName[1]
 	return project, nil
@@ -126,7 +126,7 @@ func (gkeProviderContext *GKEProviderContext) getProjectForGKE(cluster string) (
 func (gkeProviderContext *GKEProviderContext) getRegionForGKE(cluster string) (string, error) {
 	parsedName := strings.Split(cluster, "_")
 	if len(parsedName) < 3 {
-		return "", fmt.Errorf("error: failed to parse cluster name")
+		return "", fmt.Errorf("failed to parse region name from cluster name: '%s'", cluster)
 	}
 	region := parsedName[2]
 	return region, nil