Add a couple of checks to the exists checker.