Improve error message for #409