Can we add a check so this only applies to the version negotiation requests, and propagate the exception otherwise?