Added Pathfinder error handling