Add error code to message, adjust classification logic
Merge pull request #21 from drudge/master

Add error code to message, adjust classification logic