diff --git a/internal/cmd/execute_gmail_attachment_test.go b/internal/cmd/execute_gmail_attachment_test.go
index 272411e..85d8e0a 100644
--- a/internal/cmd/execute_gmail_attachment_test.go
+++ b/internal/cmd/execute_gmail_attachment_test.go
@@ -74,19 +74,19 @@ func TestExecute_GmailAttachment_OutPath_JSON(t *testing.T) {
 	run := func() (string, map[string]any) {
 		out := captureStdout(t, func() {
 			_ = captureStderr(t, func() {
-				if err := Execute([]string{
+				if execErr := Execute([]string{
 					"--output", "json",
 					"--account", "a@b.com",
 					"gmail", "attachment", "m1", "a1",
 					"--out", outPath,
-				}); err != nil {
-					t.Fatalf("Execute: %v", err)
+				}); execErr != nil {
+					t.Fatalf("Execute: %v", execErr)
 				}
 			})
 		})
 		var parsed map[string]any
-		if err := json.Unmarshal([]byte(out), &parsed); err != nil {
-			t.Fatalf("json parse: %v\nout=%q", err, out)
+		if unmarshalErr := json.Unmarshal([]byte(out), &parsed); unmarshalErr != nil {
+			t.Fatalf("json parse: %v\nout=%q", unmarshalErr, out)
 		}
 		return out, parsed
 	}
diff --git a/internal/cmd/gmail_attachment.go b/internal/cmd/gmail_attachment.go
index 3d04fed..419cb9b 100644
--- a/internal/cmd/gmail_attachment.go
+++ b/internal/cmd/gmail_attachment.go
@@ -45,13 +45,13 @@ func newGmailAttachmentCmd(flags *rootFlags) *cobra.Command {
 			}
 
 			if strings.TrimSpace(outPath) == "" {
-				dir, err := config.EnsureGmailAttachmentsDir()
-				if err != nil {
-					return err
+				dir, dirErr := config.EnsureGmailAttachmentsDir()
+				if dirErr != nil {
+					return dirErr
 				}
-				path, cached, err := downloadAttachment(cmd, svc, messageID, info, dir)
-				if err != nil {
-					return err
+				path, cached, dlErr := downloadAttachment(cmd, svc, messageID, info, dir)
+				if dlErr != nil {
+					return dlErr
 				}
 				if outfmt.IsJSON(cmd.Context()) {
 					return outfmt.WriteJSON(os.Stdout, map[string]any{"path": path, "cached": cached})