Improve error message re #7484

Signed-off-by: Karl Palmen <karl.palmen@stfc.ac.uk>
Other language improvements re #7484

Signed-off-by: Karl Palmen <karl.palmen@stfc.ac.uk>
Merge branch 'feature/7484_better_language' into develop