personally I'd rather... Catch the error look to see if the registry has a new endpoint if it has use it if it hasn't throw the error
However this is not a big piece of code so there is plenty of scope for us to experiment. I would go ahead and do whatever you prefer for the time being and at least we will have something to play with. Simon