From 25fb1296af6d9e007dfaf5102db16137dfd118cf Mon Sep 17 00:00:00 2001
From: Agniva De Sarker <agnivade@yahoo.co.in>
Date: Mon, 25 May 2020 18:38:11 +0530
Subject: [PATCH] Check for nil error in ErrConflict (#14636)

We check if the err is nil or not before calling the Error() method.

Co-authored-by: mattermod <mattermod@users.noreply.github.com>
---
 store/errors.go | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/store/errors.go b/store/errors.go
index 3208e3eef4..d2e66a5e64 100644
--- a/store/errors.go
+++ b/store/errors.go
@@ -61,7 +61,11 @@ func NewErrConflict(resource string, err error, meta string) *ErrConflict {
 }
 
 func (e *ErrConflict) Error() string {
-	return e.Resource + "exists " + e.meta + " " + e.err.Error()
+	msg := e.Resource + "exists " + e.meta
+	if e.err != nil {
+		msg += " " + e.err.Error()
+	}
+	return msg
 }
 
 func (e *ErrConflict) Unwrap() error {