Fix NPE on remove waypoint in waypoint list