Changes for exceptions-0.4.
Merge pull request #9 from benmos/exceptions-0.4

Changes for exceptions-0.4.