Avoid double-free/double-fclose on error.
am: 332513d0d2

Change-Id: I2832823edc5f85e3308f44e306b285aa83d094cc