Fix some packet NPEs