Fix Handshake Complete Event

Don't publish event if handshake fails.