If we have connection failures, return that sooner.  And if we have this...

... strange historical overload for error returns, let's ignore it and return the real value.

Suspect one of these two things (or both) is causing us to get NOTFOUND errors when really we're having troubles connecting...