Exceptions

Going through pull request process on my own stuff for the sake of testing travis-ci and history