diff --git a/cmd/kubectl_token.go b/cmd/kubectl_token.go
index 2c29788..f27881c 100644
--- a/cmd/kubectl_token.go
+++ b/cmd/kubectl_token.go
@@ -280,6 +280,9 @@ func cacheCredential(ctx *cli.Context, cred *config.ExecCredential, id string) e
 		return err
 	}
 
+	if sc.KubeCredentials[id] == nil {
+		sc.KubeCredentials = make(map[string]*config.ExecCredential)
+	}
 	sc.KubeCredentials[id] = cred
 	cf.Servers[server] = sc
 	return cf.Write()
diff --git a/cmd/server.go b/cmd/server.go
index 37bc959..ef373ac 100644
--- a/cmd/server.go
+++ b/cmd/server.go
@@ -71,8 +71,12 @@ func serverCurrent(ctx *cli.Context) error {
 	}
 
 	serverName := cf.CurrentServer
-	URL := cf.Servers[serverName].URL
-	fmt.Printf("Name: %s URL: %s\n", serverName, URL)
+	currentServer, found := cf.Servers[serverName]
+	if !found {
+		return errors.New("Current server not set")
+	}
+
+	fmt.Printf("Name: %s URL: %s\n", serverName, currentServer.URL)
 	return nil
 }