Fall back to bare address on error from server
Support falling back to bare addresses