Fail rm gracefully

Change-Id: I4e4460a94635f35e090b6f9e0a617d66bc450f4f