Bug1038424

Why do we upgrade the protocol instead of throwing here? I think we should simply throw an error so we can know clearly what's going on. Changing the url might hide other issues. Note that this shouldn't ever happen on a production environment.