Check incoming more strictly. This *appears* to work.

 Someone please ACK :)