Some exception handling in ESClient
Update for more consistency in add reply