fixed exception hotfix