Imrpved error handling
Merge branch 'master' of https://github.com/iotiva/iotiva-node.git