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

* hotfix-3434:
  Hotfix - Added proper display of user exceptions.
Merge branch 'develop'
Release: v1.18
Merge branch 'master' into develop