Merge "Add error handling to SocketClient::sendData"