Adding a lot more checks.