Changing handling of the errors according to discussion following