Merge pull request #1 from CrazyPants/1.7

1.7
How many times do you think we can fix the same bug?
Merge pull request #737 from tterrag1098/1.7

Fix the same packet NPEs...