Uppdated client, Added functionality to handle errors when node.js issent available.
Merge Client