Fix the same packet NPEs...