Fix some obvious NPEs when rotating