Added failsafe for path finder