cleanup - with errors