Housekeeping in failure case