am 0bb87fe9: Merge "Signal client thread in error cases."

* commit '0bb87fe9091f5e629f8f104c5d9547bbdf519aa0':
  Signal client thread in error cases.