Merge "Improve error message when attempting to open an empty zip"