am 8dbff580: Merge "Return the correct error code in multi-thread mode"

* commit '8dbff5809a1648750a768ad68ea601c26f4e0a43':
  Return the correct error code in multi-thread mode