From 7c885d52b95845a1b78caa919bda591b967be9de Mon Sep 17 00:00:00 2001
From: Philip O'Toole <philip.otoole@yahoo.com>
Date: Mon, 12 Apr 2021 15:31:47 -0400
Subject: [PATCH] Better error messages during unmarshal

---
 command/marshal.go | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/command/marshal.go b/command/marshal.go
index 0446ffbf..5d28461f 100644
--- a/command/marshal.go
+++ b/command/marshal.go
@@ -182,19 +182,22 @@ func UnmarshalSubCommand(c *Command, m proto.Message) error {
 	if c.Compressed {
 		gz, err := gzip.NewReader(bytes.NewReader(b))
 		if err != nil {
-			return err
+			fmt.Errorf("unmarshal sub gzip NewReader: %s", err)
 		}
 
 		ub, err := ioutil.ReadAll(gz)
 		if err != nil {
-			return err
+			fmt.Errorf("unmarshal sub gzip ReadAll: %s", err)
 		}
 
 		if err := gz.Close(); err != nil {
-			return err
+			fmt.Errorf("unmarshal sub gzip Close: %s", err)
 		}
 		b = ub
 	}
 
-	return proto.Unmarshal(b, m)
+	if err := proto.Unmarshal(b, m); err != nil {
+		return fmt.Errorf("proto unmarshal: %s", err)
+	}
+	return nil
 }