From 97818c39156b4e1523d582aeb03a051fdb0c02a9 Mon Sep 17 00:00:00 2001
From: Scott Bishel <scott.bishel@mattermost.com>
Date: Thu, 4 Aug 2022 14:30:25 -0600
Subject: [PATCH] Additional fix for GetMemberForBoard returning nil,nil 
 (#3570)

* fix panic

* remove else
---
 .../store/mattermostauthlayer/mattermostauthlayer.go         | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/server/services/store/mattermostauthlayer/mattermostauthlayer.go b/server/services/store/mattermostauthlayer/mattermostauthlayer.go
index 9113c8e10..08077d632 100644
--- a/server/services/store/mattermostauthlayer/mattermostauthlayer.go
+++ b/server/services/store/mattermostauthlayer/mattermostauthlayer.go
@@ -695,7 +695,7 @@ func (s *MattermostAuthLayer) GetMemberForBoard(boardID, userID string) (*model.
 				if errors.As(memberErr, &appErr) && appErr.StatusCode == http.StatusNotFound {
 					// Plugin API returns error if channel member doesn't exist.
 					// We're fine if it doesn't exist, so its not an error for us.
-					return nil, nil
+					return nil, model.NewErrNotFound(userID)
 				}
 
 				return nil, memberErr
@@ -712,7 +712,8 @@ func (s *MattermostAuthLayer) GetMemberForBoard(boardID, userID string) (*model.
 				Synthetic:       true,
 			}, nil
 		}
-	} else {
+	}
+	if err != nil {
 		return nil, err
 	}
 	return bm, nil