Improve validation and errors around validation