Fix translation issues in error messages
Merge branch 'hotfix/fix-translate-issues-in-exceptions'