Safety checks and bidirectional search change to detect failure case faster