exception handler hotfix