Added more checks.