Fix some issues discovered by SCA. (commit: b0a217a)
Handle null values in collections in OOM. (commit: 40bb82e)