Retirement tax questions

Yes, you should double check line 71 on your 2015 return to see if it happened again.  And then next year for 2016 you should either not transfer from 2015 or delete all the W2s and re-enter them from scratch.