Prevent breakage if handshake fails and a disconnect happens before handshake completion