diff --git a/electrum/plugin.py b/electrum/plugin.py
index 4652c7bb2..e570ce6df 100644
--- a/electrum/plugin.py
+++ b/electrum/plugin.py
@@ -598,6 +598,8 @@ class DeviceMgr(ThreadJob):
                 continue
             try:
                 client = self.create_client(device, handler, plugin)
+                if not client:
+                    continue
                 label = client.label()
                 is_initialized = client.is_initialized()
                 soft_device_id = client.get_soft_device_id()
@@ -607,8 +609,6 @@ class DeviceMgr(ThreadJob):
                 if include_failing_clients:
                     infos.append(DeviceInfo(device=device, exception=e, plugin_name=plugin.name))
                 continue
-            if not client:
-                continue
             infos.append(DeviceInfo(device=device,
                                     label=label,
                                     initialized=is_initialized,