Update to handle when collection is null (kvc), some testing