Added validation, still need to display error message