diff --git a/gso/tasks/massive_redeploy_base_config.py b/gso/tasks/massive_redeploy_base_config.py
index cc4b5b9ddd95afc7341c98934c5a253f8f88c014..7dda4e42cb4e12591bf38cbc41ee7466d124ddb7 100644
--- a/gso/tasks/massive_redeploy_base_config.py
+++ b/gso/tasks/massive_redeploy_base_config.py
@@ -23,7 +23,7 @@ def process_one_router(router_id: UUIDstr, tt_number: TTNumber) -> tuple[str, bo
 
     Returns (router_fqdn, succeeded:bool, message:str).
     """
-    router_fqdn = ""
+    router_fqdn = router_id
     succeeded = False
     message = ""
     try:
@@ -51,7 +51,7 @@ def process_one_router(router_id: UUIDstr, tt_number: TTNumber) -> tuple[str, bo
     except FormValidationError as e:
         message = f"Validation error: {e}"
     except Exception as e:  # noqa: BLE001
-        message = f"Unexpected error: {e}"
+        message = f"Unexpected error: {e}, router_fqdn: {router_fqdn}"
 
     return router_fqdn, succeeded, message