test fix for exceptions during clean up