Fix the NPEs on teleport :D