Added additional checks.