Fix potential dereference when starting avalon with all new work.