some raw exception cleanup