Update error messages

Update error messages according to PR Comments.