CLOUD-383 updated exception handling