REST exception handling vol. 2
Merge branch 'exception-handler-2'