Fixing exceptions to be succinct