am 255405eb: am 86b2ecdd: Merge "fix mem leak on error handling"

* commit '255405eb19e6a3fa7f7bb4de9b07beacdf65ece9':
  fix mem leak on error handling