Exception handling improvement.