Simplify handling of exceptions in ZipPackage The code became overly complex and hard to reason about. We can avoid some additional catching/rethrowing of exceptions.