Fix some packet NPEs
Merge pull request #736 from tterrag1098/1.7

Fix some packet NPEs