Added roboustness on client.