OC-383: Modify the behaviour for failure in UploadOperation. OC-152