diff --git a/utils/config.go b/utils/config.go
index e3f3bdc..eb9fd6a 100644
--- a/utils/config.go
+++ b/utils/config.go
@@ -20,11 +20,12 @@ var Cfg Config
 // GetKubeConfig is used to fetch the kubeConfig based on the KUBECONFIG env or '~/.kube/config' location
 func GetKubeConfig() (*rest.Config, error) {
 	var kubeConfigPath string
+	var defaultKubeConfigPath = "~/.kube/config"
+
 	if home := homedir.HomeDir(); home != "" {
-		kubeConfigPath = filepath.Join(home, ".kube", "config")
-	} else {
-		kubeConfigPath = GetEnv("KUBECONFIG", "~/.kube/config")
+		defaultKubeConfigPath = filepath.Join(home, ".kube", "config")
 	}
+	kubeConfigPath = GetEnv("KUBECONFIG", defaultKubeConfigPath)
 
 	k8sConfig, err := clientcmd.BuildConfigFromFlags("", kubeConfigPath)
 	return k8sConfig, err
@@ -33,6 +34,10 @@ func GetKubeConfig() (*rest.Config, error) {
 // k8sAuth is used to get the Kubernetes clientset from the config
 func k8sAuth() (*k8s.Clientset, error) {
 	k8sConfig, err := GetKubeConfig()
+	if err != nil {
+		log.Fatalf("Error while getting kubeconfig: %v", err)
+	}
+
 	clientset, err := k8s.NewForConfig(k8sConfig)
 	if err != nil {
 		log.Fatalf("Error while creating the clientset: %v", err)
diff --git a/utils/utils.go b/utils/utils.go
index 3db66d6..51c366c 100644
--- a/utils/utils.go
+++ b/utils/utils.go
@@ -8,7 +8,7 @@ import (
 
 // GetEnv Helper function for fetching envs with defaults
 func GetEnv(env, defaults string) string {
-	if val, ok := os.LookupEnv(env); ok {
+	if val, ok := os.LookupEnv(env); ok && val != "" {
 		return val
 	}
 	return defaults