Refactor error messages for all