Added more checks 1