Hm, I was a bit confused by your wording here, because I am able to trigger all the errors just fine even before this PR, but I do think that even though this isn't necessarily fixing inaccurate error messages (all the error messages *are* accurate), you're right that the text of the messages does seem to indicate that the original authors intended a cascade ordering more like the one you've proposed.

I'll give this a more thorough review a bit later, thanks for working on this!