CLOUDIFY-2222 better error handling