am 85019f27: Avoid double-free on error.

* commit '85019f27b4140f86450948f3486a64743d1f8671':
  Avoid double-free on error.