Probe handshake

@DavidVorick, please double-check d47d81fd. I'm not sure if we want err == nil or err != nil, but the comment implies that it should be err == nil.