Tweak exception handling