cleanup - fixing error message texts