CLOUD-169 added exception handling