Added client-push Error Handling logic on failing to add new host
Merge from origin/master