Do not crash if keep on update property is null