Reflect errors to UI
Merge branch 'master' into dev
Merge pull request #182 from jrconlin/dev

reflect client errors to UI