CLOUD-216 error handling