Error-case handling improvement.