diff --git a/src/DIRAC/FrameworkSystem/scripts/dirac_login.py b/src/DIRAC/FrameworkSystem/scripts/dirac_login.py
index 9887b91a05d..655d072fae8 100644
--- a/src/DIRAC/FrameworkSystem/scripts/dirac_login.py
+++ b/src/DIRAC/FrameworkSystem/scripts/dirac_login.py
@@ -317,22 +317,22 @@ def loginWithCertificate(self):
                 if not res["OK"]:
                     return res
 
-            # Get a token for use with
+            # Get a token for use with diracx
             res = Client(url="Framework/ProxyManager").exchangeProxyForToken()
-            if not res["OK"]:
-                return res
-
-            DIRAC_TOKEN_FILE.parent.mkdir(parents=True, exist_ok=True)
-            expires = datetime.datetime.now(tz=datetime.timezone.utc) + datetime.timedelta(
-                seconds=res["Value"]["expires_in"] - EXPIRES_GRACE_SECONDS
-            )
-            credential_data = {
-                "access_token": res["Value"]["access_token"],
-                # TODO: "refresh_token":
-                # TODO: "refresh_token_expires":
-                "expires": expires.isoformat(),
-            }
-            DIRAC_TOKEN_FILE.write_text(json.dumps(credential_data))
+            if res["OK"]:
+                DIRAC_TOKEN_FILE.parent.mkdir(parents=True, exist_ok=True)
+                expires = datetime.datetime.now(tz=datetime.timezone.utc) + datetime.timedelta(
+                    seconds=res["Value"]["expires_in"] - EXPIRES_GRACE_SECONDS
+                )
+                credential_data = {
+                    "access_token": res["Value"]["access_token"],
+                    # TODO: "refresh_token":
+                    # TODO: "refresh_token_expires":
+                    "expires": expires.isoformat(),
+                }
+                DIRAC_TOKEN_FILE.write_text(json.dumps(credential_data))
+            else:
+                gLogger.warn(res["Message"])
         return S_OK()
 
     def __enableCS(self):
diff --git a/src/DIRAC/FrameworkSystem/scripts/dirac_proxy_init.py b/src/DIRAC/FrameworkSystem/scripts/dirac_proxy_init.py
index 20daadf3338..9da537c52b1 100755
--- a/src/DIRAC/FrameworkSystem/scripts/dirac_proxy_init.py
+++ b/src/DIRAC/FrameworkSystem/scripts/dirac_proxy_init.py
@@ -246,20 +246,20 @@ def doTheMagic(self):
 
         # res = Client(url="dips://lhcbvoboxcertif00.cern.ch:9152/Framework/ProxyManager").exchangeProxyForToken()
         res = Client(url="Framework/ProxyManager").exchangeProxyForToken()
-        if not res["OK"]:
-            return res
-
-        DIRAC_TOKEN_FILE.parent.mkdir(parents=True, exist_ok=True)
-        expires = datetime.datetime.now(tz=datetime.timezone.utc) + datetime.timedelta(
-            seconds=res["Value"]["expires_in"] - EXPIRES_GRACE_SECONDS
-        )
-        credential_data = {
-            "access_token": res["Value"]["access_token"],
-            # TODO: "refresh_token":
-            # TODO: "refresh_token_expires":
-            "expires": expires.isoformat(),
-        }
-        DIRAC_TOKEN_FILE.write_text(json.dumps(credential_data))
+        if res["OK"]:
+            DIRAC_TOKEN_FILE.parent.mkdir(parents=True, exist_ok=True)
+            expires = datetime.datetime.now(tz=datetime.timezone.utc) + datetime.timedelta(
+                seconds=res["Value"]["expires_in"] - EXPIRES_GRACE_SECONDS
+            )
+            credential_data = {
+                "access_token": res["Value"]["access_token"],
+                # TODO: "refresh_token":
+                # TODO: "refresh_token_expires":
+                "expires": expires.isoformat(),
+            }
+            DIRAC_TOKEN_FILE.write_text(json.dumps(credential_data))
+        else:
+            gLogger.warn(res["Message"])
 
         return S_OK()