Correct message. i+1 is the current length, msg should say 1+2.

After the fix, sample message is "unexpected number of fields: want 15, got 16 (or more)"