Merge branch 'hotfix/6333'

Close #6333
Replaced wrong placeholder in Exception string
Merge branch 'eiwaen-bugfix/6377' into develop