Avoid double-free/double-fclose on error. am: 332513d0d2 am: 6c5b3c3fed am: 8d222cd40c am: e1b95886e2
am: 85ec116a32

Change-Id: I6e0ac3d3bd9cc300c56eea42875aa96e508552d3