diff --git a/tableauserverclient/server/endpoint/server_info_endpoint.py b/tableauserverclient/server/endpoint/server_info_endpoint.py
index 97901d7ae..0a6b9ec89 100644
--- a/tableauserverclient/server/endpoint/server_info_endpoint.py
+++ b/tableauserverclient/server/endpoint/server_info_endpoint.py
@@ -1,5 +1,5 @@
 from .endpoint import Endpoint, api
-from .exceptions import ServerResponseError, ServerInfoEndpointNotFoundError
+from .exceptions import ServerResponseError, ServerInfoEndpointNotFoundError, EndpointUnavailableError
 from ...models import ServerInfoItem
 import logging
 
@@ -19,6 +19,8 @@ def get(self):
         except ServerResponseError as e:
             if e.code == "404003":
                 raise ServerInfoEndpointNotFoundError
+            if e.code == "404001":
+                raise EndpointUnavailableError
 
         server_info = ServerInfoItem.from_response(server_response.content, self.parent_srv.namespace)
         return server_info
diff --git a/test/test_sort.py b/test/test_sort.py
index 88c0da728..17a69e900 100644
--- a/test/test_sort.py
+++ b/test/test_sort.py
@@ -58,7 +58,7 @@ def test_filter_in(self):
                                                        auth_token='j80k54ll2lfMZ0tv97mlPvvSCRyD0DOM',
                                                        content_type='text/xml')
 
-            self.assertEqual(resp.request.query, 'pagenumber=13&pagesize=13&filter=tags:in:[stocks,market]')
+            self.assertEqual(resp.request.query, 'pagenumber=13&pagesize=13&filter=tags:in:%5bstocks,market%5d')
 
     def test_sort_asc(self):
         with requests_mock.mock() as m: