diff --git a/cmd/photos-api-cli/upload.go b/cmd/photos-api-cli/upload.go
index 6414ba9..fc81d8b 100644
--- a/cmd/photos-api-cli/upload.go
+++ b/cmd/photos-api-cli/upload.go
@@ -34,9 +34,10 @@ func (c *UploadCommand) Execute(args []string) error {
 	if resp.IsError() {
 		return resp.Error().(*photosapi.ErrorWithDetails)
 	}
-
 	uploadId := resp.Result().(*photosapi.Upload).Id
 
+	defer cli.R().SetPathParam("id", uploadId).Delete("/upload/{id}")
+
 	f, err := os.Open(c.File)
 	if err != nil {
 		return err
@@ -86,21 +87,29 @@ func (c *UploadCommand) Execute(args []string) error {
 		}
 	}
 
-	fmt.Printf(
-		"Result:\n    - Upload ID: %s\n    - Parts: %d\n",
+	completeRequest := &photosapi.UploadCompleteRequest{
+		Sha256: hex.EncodeToString(completesha256.Sum(nil)),
+		Parts:  uint(parts),
+		Name:   filepath.Base(c.File),
+	}
+
+	fmt.Printf(`Result:
+    - Upload ID: %s
+    - Name     : %s
+    - Parts    : %d
+    - SHA256   : %s
+`,
 		uploadId,
-		parts,
+		completeRequest.Name,
+		completeRequest.Parts,
+		completeRequest.Sha256,
 	)
 
 	resp, err = cli.
 		R().
 		SetError(&photosapi.ErrorWithDetails{}).
 		SetPathParam("id", uploadId).
-		SetBody(&photosapi.UploadCompleteRequest{
-			Sha256: hex.EncodeToString(completesha256.Sum(nil)),
-			Parts:  uint(parts),
-			Name:   filepath.Base(c.File),
-		}).
+		SetBody(completeRequest).
 		Post("/upload/{id}")
 
 	if err != nil {
@@ -111,8 +120,6 @@ func (c *UploadCommand) Execute(args []string) error {
 		return resp.Error().(*photosapi.ErrorWithDetails)
 	}
 
-	cli.R().SetPathParam("id", uploadId).Delete("/upload/{id}")
-
 	return nil
 }