Some wording changes in error message to make it clearer