Add channel name to error message
Initial commit