PlanEditor: Adding null pointer protections that arose in editing a plan.