Improve error message via @annolangen in PR #853