I'll add a separate error case since it looks easy.  I also found #7389 in the process, so I guess it's good I wound up poking at this code :-)