Improve error message for #409
Merge branch 'master' into develop