CLOUD-216 handle failures when saving cluster