Add additional checks.