Include exception code and, if applicable, error constant.
Merge pull request #212 from adduc/master

Include exception code and, if applicable, error constant.