141110-iss002: modify error handling