Added Removal of Resources on Failure