Added more validation
Oops forgot to add