Alter the RESCUE option until you fix the bugs

If Thrall get stuck we usually just leave them there eventually they return home (not sure how long I think it takes an hour??), I know it’s pain in the bum but that’s the solution we use until this has been fix.
I hope this helps.