Reintroduce header checking.
Dummy message handling was broken and null messages were being randhopped.  Sorted now.