Merge pull request #11 from jmoses/master

Decorate the payload with the error for the error handler.