fix finish exception handler