Try a little harder to find the protocol rather than giving up. Fixes #2751