Definitely a better error message, but the code looks functionally equivalent.  Should we leave this alone and commit upstream and get later?