diff --git a/pkg/cmd/resource/terminal_quickstart.go b/pkg/cmd/resource/terminal_quickstart.go
index 32afce605..23ce584d7 100644
--- a/pkg/cmd/resource/terminal_quickstart.go
+++ b/pkg/cmd/resource/terminal_quickstart.go
@@ -1,8 +1,6 @@
 package resource
 
 import (
-	"fmt"
-
 	"github.com/spf13/cobra"
 
 	"github.com/stripe/stripe-cli/pkg/config"
@@ -40,26 +38,26 @@ func (cc *QuickstartCmd) runQuickstartCmd(cmd *cobra.Command, args []string) err
 	key, err := cc.cfg.Profile.GetAPIKey(false)
 
 	if err != nil {
-		return fmt.Errorf("%s", err.Error())
+		return err
 	}
 
 	err = validators.APIKeyNotRestricted(key)
 
 	if err != nil {
-		return fmt.Errorf("%s", err.Error())
+		return err
 	}
 
 	readers := terminal.ReaderNames()
 	reader, err := terminal.ReaderTypeSelectPrompt(readers)
 
 	if err != nil {
-		return fmt.Errorf("%s", err.Error())
+		return err
 	}
 
 	if reader == terminal.ReaderList["verifone-p400"].Name {
 		err = terminal.QuickstartP400(cmd.Context(), cc.cfg)
 		if err != nil {
-			return fmt.Errorf("%s", err.Error())
+			return err
 		}
 	}
 
diff --git a/pkg/terminal/quickstart_p400.go b/pkg/terminal/quickstart_p400.go
index 98aa5cdaa..8eab74899 100644
--- a/pkg/terminal/quickstart_p400.go
+++ b/pkg/terminal/quickstart_p400.go
@@ -3,6 +3,7 @@ package terminal
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"os"
 	"time"
@@ -20,11 +21,11 @@ func QuickstartP400(ctx context.Context, cfg *config.Config) error {
 	tsCtx, err := p400.RegisterAndActivateReader(ctx, tsCtx)
 
 	if err != nil {
-		if err.Error() == promptui.ErrInterrupt.Error() {
+		if errors.Is(err, promptui.ErrInterrupt) {
 			os.Exit(1)
-		} else {
-			return fmt.Errorf("%s", err.Error())
 		}
+
+		return err
 	}
 
 	fmt.Println("Got it!")
@@ -33,22 +34,22 @@ func QuickstartP400(ctx context.Context, cfg *config.Config) error {
 
 	if err != nil {
 		p400.ClearReaderDisplay(tsCtx)
-		if err.Error() == promptui.ErrInterrupt.Error() {
+		if errors.Is(err, promptui.ErrInterrupt) {
 			os.Exit(1)
-		} else {
-			return fmt.Errorf("%s", err.Error())
 		}
+
+		return err
 	}
 
 	tsCtx, err = p400.CompleteTestPayment(ctx, tsCtx)
 
 	if err != nil {
 		p400.ClearReaderDisplay(tsCtx)
-		if err.Error() == promptui.ErrInterrupt.Error() {
+		if errors.Is(err, promptui.ErrInterrupt) {
 			os.Exit(1)
-		} else {
-			return fmt.Errorf("%s", err.Error())
 		}
+
+		return err
 	}
 
 	p400.SummarizeQuickstartCompletion(tsCtx)