Add guard against null on add/set