Merge "Fixed check if zip file was generated properly."