CLOUD-216 fail logic in delete
CLOUD-216 fixed format