DFix the code

You are right, this should be `Exception`. I'll go through the commit and fix these.