fix for exceptions, we cant keep iterating the collection once we have removed an entry.