DATA-1471 Follow-up work. Added error filtering.