diff --git a/etcdctl/ctlv3/command/lease_command.go b/etcdctl/ctlv3/command/lease_command.go
index 0afb3d69c..26b9c6cb6 100644
--- a/etcdctl/ctlv3/command/lease_command.go
+++ b/etcdctl/ctlv3/command/lease_command.go
@@ -148,13 +148,12 @@ func leaseKeepAliveCommandFunc(cmd *cobra.Command, args []string) {
 	}
 
 	id := leaseFromArgs(args[0])
-	respc, kerr := mustClientFromCmd(cmd).KeepAlive(context.TODO(), id)
-	if kerr != nil {
-		ExitWithError(ExitBadConnection, kerr)
-	}
-
+	respc := mustClientFromCmd(cmd).KeepAlive(context.TODO(), id)
 	for resp := range respc {
-		display.KeepAlive(*resp)
+		if resp.Err != nil {
+			ExitWithError(ExitError, resp.Err)
+		}
+		display.KeepAlive(resp)
 	}
 
 	if _, ok := (display).(*simplePrinter); ok {