ensure tarballs are not written on error
Merge "ensure tarballs are not written on error"