extend exception message
Merge branch 'issue-1029' of github.com:mariansollmann/CM into issue-1031