Add some further initialization and protection for zero-byte messages