Best thing to do is keep a complete copy of the original I-94 as evidence of your TN status. The rules about relinquishing your I-94 are obviously applied inconsistently. If you have a copy, it's easier to get a new one.