Also IMO the protocol should be reliable to always provide the message when the handshake is finished.