Merge "Throw exception on empty/invalid zip"