Add null check and refine preconditions for on-ground shortcut.
Attempt to fix issues with (non exact) respawn.