Hotfix - Added proper display of user exceptions.
Merge branch 'hotfix-3434'

* hotfix-3434:
  Hotfix - Added proper display of user exceptions.