Your patch looks good to me, I have no objection so long as this error will be caught instead of failing without complaint.  I am rejecting my patch in favor of yours.  Thanks for looking into this.