Added validations and error message partial