Merge pull request #1106 from lgierth/dont-extend-exception

Don't extend exception