More protection against empty packets