Workaround for dealing with NPEs in collections

We basically create a new collection; not very pretty