reverted exception hotfix