cid#982171 Warn about rename failure in error clean-up code

Change-Id: I02e81d526c07297a5bc3664cc475302a552187eb