MODIFY error messages to simpler way