From 4de219903ab4d483b4ed0c32f74e66f79adfad49 Mon Sep 17 00:00:00 2001
From: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Date: Tue, 22 Aug 2017 09:39:31 -0700
Subject: [PATCH] errdefs: Provide a valid stack in all cases

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
---
 errdefs/grpc.go | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/errdefs/grpc.go b/errdefs/grpc.go
index eb690e87d..a35c75c7a 100644
--- a/errdefs/grpc.go
+++ b/errdefs/grpc.go
@@ -73,13 +73,11 @@ func FromGRPC(err error) error {
 		cls = ErrUnknown
 	}
 
-	if cls != nil {
-		msg := rebaseMessage(cls, err)
-		if msg != "" {
-			err = errors.Wrapf(cls, msg)
-		} else {
-			err = cls
-		}
+	msg := rebaseMessage(cls, err)
+	if msg != "" {
+		err = errors.Wrapf(cls, msg)
+	} else {
+		err = errors.WithStack(cls)
 	}
 
 	return err