diff --git a/cli/app/cp.go b/cli/app/cp.go
index 63087d49..fa9d7376 100644
--- a/cli/app/cp.go
+++ b/cli/app/cp.go
@@ -111,10 +111,10 @@ var appCpCommand = &cli.Command{
 			}
 		} else {
 			content, _, err := cl.CopyFromContainer(ctx, container.ID, srcPath)
-			defer content.Close()
 			if err != nil {
 				logrus.Fatal(err)
 			}
+			defer content.Close()
 			fromTarOpts := &archive.TarOptions{NoOverwriteDirNonDir: true, Compression: archive.Gzip}
 			if err := archive.Untar(content, dstPath, fromTarOpts); err != nil {
 				logrus.Fatal(err)
diff --git a/cli/app/logs.go b/cli/app/logs.go
index 7b862840..f2aa8a09 100644
--- a/cli/app/logs.go
+++ b/cli/app/logs.go
@@ -42,6 +42,10 @@ func stackLogs(stackName string, client *dockerClient.Client) {
 				Timestamps: true,
 			}
 			logs, err := client.ServiceLogs(ctx, s, logOpts)
+			if err != nil {
+				logrus.Fatal(err)
+			}
+			// defer after err check as any err returns a nil io.ReadCloser
 			defer logs.Close()
 
 			_, err = io.Copy(os.Stdout, logs)
@@ -107,6 +111,10 @@ var appLogsCommand = &cli.Command{
 			Timestamps: true,
 		}
 		logs, err := cl.ServiceLogs(ctx, services[0].ID, logOpts)
+		if err != nil {
+			logrus.Fatal(err)
+		}
+		// defer after err check as any err returns a nil io.ReadCloser
 		defer logs.Close()
 
 		_, err = io.Copy(os.Stdout, logs)