* include channel name in error * update multiple returns --------- Co-authored-by: Mattermost Build <build@mattermost.com>