[Review needed] Add chain-pair to prevent a header and entry mismatch

Please feel free to review this #PR:

#pull_request #review_needed #impossible_states