diff --git a/cli/app/cp.go b/cli/app/cp.go
index a4476abc8..63087d49e 100644
--- a/cli/app/cp.go
+++ b/cli/app/cp.go
@@ -111,14 +111,15 @@ var appCpCommand = &cli.Command{
 			}
 		} else {
 			content, _, err := cl.CopyFromContainer(ctx, container.ID, srcPath)
+			defer content.Close()
 			if err != nil {
 				logrus.Fatal(err)
 			}
 			fromTarOpts := &archive.TarOptions{NoOverwriteDirNonDir: true, Compression: archive.Gzip}
-			archive.Untar(content, dstPath, fromTarOpts)
-			defer content.Close()
+			if err := archive.Untar(content, dstPath, fromTarOpts); err != nil {
+				logrus.Fatal(err)
+			}
 		}
-
 		return nil
 	},
 }