Issue #2248275 by DamienMcKenna: Ensure there's always a 'did' value prior to saving.