A couple of extra checks.