Error messages refactor