diff --git a/api4/group_test.go b/api4/group_test.go
index 611159525d..a7ef53f265 100644
--- a/api4/group_test.go
+++ b/api4/group_test.go
@@ -236,10 +236,12 @@ func TestUnlinkGroupTeam(t *testing.T) {
 
 	response = th.Client.UnlinkGroupSyncable(g.Id, th.BasicTeam.Id, model.GroupSyncableTypeTeam)
 	assert.NotNil(t, response.Error)
-
 	th.UpdateUserToTeamAdmin(th.BasicUser, th.BasicTeam)
-	th.Client.Logout()
-	th.Client.Login(th.BasicUser.Email, th.BasicUser.Password)
+	ok, response := th.Client.Logout()
+	assert.True(t, ok)
+	CheckOKStatus(t, response)
+	_, response = th.Client.Login(th.BasicUser.Email, th.BasicUser.Password)
+	CheckOKStatus(t, response)
 
 	response = th.Client.UnlinkGroupSyncable(g.Id, th.BasicTeam.Id, model.GroupSyncableTypeTeam)
 	CheckOKStatus(t, response)
diff --git a/app/team.go b/app/team.go
index d19faad8ba..8f83664b7c 100644
--- a/app/team.go
+++ b/app/team.go
@@ -1602,7 +1602,7 @@ func (a *App) ClearTeamMembersCache(teamID string) {
 	for {
 		teamMembers, err := a.Srv().Store.Team().GetMembers(teamID, page, perPage, &model.ViewUsersRestrictions{})
 		if err != nil {
-			a.Log().Warn("error clearing cache for team members", mlog.String("team_id", teamID))
+			a.Log().Warn("error clearing cache for team members", mlog.String("team_id", teamID), mlog.String("err", err.Error()))
 			break
 		}