Merge pull request #812 from juherr/issue-784

Fix issue #784: Duplicate error messages