Bug 1087997 - better handling of failures on data ingestion