CLOUDIFY-1926 Better error handling