MVC-77 refactored to validate.