diff --git a/cli/config/config.go b/cli/config/config.go
index 312726f5a5..09810782c3 100644
--- a/cli/config/config.go
+++ b/cli/config/config.go
@@ -28,10 +28,9 @@ var (
 func init() {
 	if configDir == "" {
 		homedir, err := os.UserHomeDir()
-		if err != nil {
-			panic(err)
+		if err == nil {
+			configDir = filepath.Join(homedir, configFileDir)
 		}
-		configDir = filepath.Join(homedir, configFileDir)
 	}
 }