Clarified exception handling.