diff --git a/cmd/configure.go b/cmd/configure.go
index af1fa3b5..1551a9d7 100644
--- a/cmd/configure.go
+++ b/cmd/configure.go
@@ -73,7 +73,7 @@ func configureCmdRun(cmd *cobra.Command, args []string) error {
 	}
 
 	if err := viper.WriteConfigAs(configPath); err != nil {
-		fmt.Errorf("Failed to write configuration: %v", err.Error())
+		return fmt.Errorf("Failed to write configuration: %v", err.Error())
 	}
 
 	fmt.Println("Updated configuration.")
diff --git a/cmd/token.go b/cmd/token.go
index bebb5f45..5133b14b 100644
--- a/cmd/token.go
+++ b/cmd/token.go
@@ -50,7 +50,11 @@ func loginCmdRun(cmd *cobra.Command, args []string) error {
 
 	if clientID == "" || clientSecret == "" {
 		println("No Client ID or Secret found in configuration. Triggering configuration now.")
-		configureCmd.Run(cmd, args)
+		err := configureCmd.RunE(cmd, args)
+		if err != nil {
+			return err
+		}
+
 		clientID = viper.GetString("clientId")
 		clientSecret = viper.GetString("clientSecret")
 	}