add some more checks.