Added error messages to validation