Update to error processing