move outside try

home-assistant · May 9, 2024 · 4162556 · 4162556
1 parent 42035be
commit 4162556
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/homeassistant/components/v2c/config_flow.py b/homeassistant/components/v2c/config_flow.py
@@ -44,10 +44,6 @@ async def async_step_user(
             try:
                 data = await evse.get_data()
 
-                if data.ID:
-                    await self.async_set_unique_id(data.ID)
-                    self._abort_if_unique_id_configured()
-
             except TrydanError:
                 errors["base"] = "cannot_connect"
             except AbortFlow:
@@ -56,6 +52,10 @@ async def async_step_user(
                 _LOGGER.exception("Unexpected exception")
                 errors["base"] = "unknown"
             else:
+                if data.ID:
+                    await self.async_set_unique_id(data.ID)
+                    self._abort_if_unique_id_configured()
+
                 return self.async_create_entry(
                     title=f"EVSE {user_input[CONF_HOST]}", data=user_input
                 )