Fixed null cleanup case.