fix: Make sure the primary path exists at various steps in the handshake

fix: Make sure the primary path exists at various steps in the handshake #2314