Correct handling of P2P messages