141111-iss003: modify error handling