Clarified exception handling