cid#1242936 handle rename failure

Change-Id: I92ce690a6f8183ce77c8ed53bd2fcb45d39d756e