MDL-31989: Better error handling in case of missing records