Add more collection checking for ingest