zip2: Reworked exception handling.