141111-iss001: modify error handling routine