diff --git a/companion.py b/companion.py
index 43722007..eadfb1d9 100644
--- a/companion.py
+++ b/companion.py
@@ -277,9 +277,6 @@ class Auth(object):
 
             logger.debug('Attempting refresh with Frontier...')
             try:
-                if conf_module.capi_pretend_down:
-                    raise ServerError(_('Pretending CAPI is down'))
-
                 r = self.session.post(SERVER_AUTH + URL_TOKEN, data=data, timeout=auth_timeout)
                 if r.status_code == requests.codes.ok:
                     data = r.json()
@@ -364,9 +361,6 @@ class Auth(object):
             # requests_log.setLevel(logging.DEBUG)
             # requests_log.propagate = True
 
-            if conf_module.capi_pretend_down:
-                raise ServerError(_('Pretending CAPI is down'))
-
             r = self.session.post(SERVER_AUTH + URL_TOKEN, data=request_data, timeout=auth_timeout)
             data_token = r.json()
             if r.status_code == requests.codes.ok:
@@ -573,7 +567,7 @@ class Session(object):
         try:
             logger.trace_if('capi.query', 'Trying...')
             if conf_module.capi_pretend_down:
-                raise ServerError('Pretending CAPI is down')
+                raise ServerError(f'Pretending CAPI is down for {endpoint} endpoint')
 
             r = self.session.get(self.server + endpoint, timeout=timeout)  # type: ignore