fix NPEs in CollectionContainer and CollectionItem
Merge pull request #2212 from eminn/fix/NPEsInTransactionalSet

[backport] fix NPEs in CollectionContainer and CollectionItem