am 5f130216: Merge "Handle errno properly to avoid corrupt str_parms"

* commit '5f130216762278331b5d97eaf1fb549680143c85':
  Handle errno properly to avoid corrupt str_parms