Refactoring error messages again