141110-iss001: modify error handling routine