Hardened flushing by sending a final "null" message
Merge pull request #990 from drewhk/wip-hardened-flushing-drewhk

Hardened flushing by sending a final "null" message