Update error handling.
Merge branch 'master' into RESTEasy3