[DF-4070] Fixed error processing