exceptions to return if caught
Merge pull request #59 from chorus-frogs-2014/exception-handling

exceptions to return if caught