this i can revert, but the PR is good to merge, it fixes serious issues with exceptions