Fix NPE....

This should be handled differently. Instead of keeping invalid points
perhaps it should only show valid waypoints.