Waypoint manager error fix