Forgot some files
Merge pull request #163 from jaytaph/exceptions

Forgot some files