Fix issue when collection doesn't exist