Added exception class names
Merge pull request #913 from WouterJ/patch-1

Added exception class names