Add error message and validation errors to base repo