remove the EmptyCollectionException stuff