Ensure the exception message is in the error message

- when in development mode. Reported by @Akrabat
Merge branch 'hotfix/final-handler'