diff --git a/pkg/errors/utils.go b/pkg/errors/utils.go index 83f889d6e..2d6ceef9d 100644 --- a/pkg/errors/utils.go +++ b/pkg/errors/utils.go @@ -67,16 +67,17 @@ func Is(err error, target error) bool { } func FromError(err error) (*ErrorType, bool) { + if err == nil { + return nil, true + } if errType, ok := err.(*ErrorType); ok { return errType, true } - if errStatus, ok := status.FromError(err); ok { if errType, ok := Convert(errStatus.Message()); ok { return errType, true } } - return ErrUnknown.WithMessage(err.Error()), false } diff --git a/vsctl/command/util.go b/vsctl/command/util.go index be3726ac6..5feeee696 100644 --- a/vsctl/command/util.go +++ b/vsctl/command/util.go @@ -126,6 +126,9 @@ func IsDNS1123Subdomain(value string) bool { } func Error(err error) string { + if err == nil { + return "" + } e, _ := errors.FromError(err) if e.Message == "" { return e.Description