Adding more checks