am ff856a2b: Merge "Add error handling to SocketClient::sendData"

* commit 'ff856a2b927aaadb189181d2cd9dd08dc98456a4':
  Add error handling to SocketClient::sendData