fix on exception handler