diff --git a/lib/nrfx b/lib/nrfx
index 11f57e578..7a4c9d946 160000
--- a/lib/nrfx
+++ b/lib/nrfx
@@ -1 +1 @@
-Subproject commit 11f57e578c7feea13f21c79ea0efab2630ac68c7
+Subproject commit 7a4c9d946cf1801771fc180acdbf7b878f270093
diff --git a/tests/hwtest.py b/tests/hwtest.py
index c53b65a01..52d714ae6 100755
--- a/tests/hwtest.py
+++ b/tests/hwtest.py
@@ -12,7 +12,7 @@ import time
 import serial_test
 
 sys.path.append("../tools/mpremote")
-from mpremote.transport_serial import SerialTransport
+from mpremote.transport_serial import SerialTransport, TransportError
 import mpremote.commands
 import mpremote.mip
 
@@ -91,6 +91,7 @@ def map_device_name(d):
 
 
 def detect_octoprobe(device):
+    print(f"detect_octoprobe({device})")
     t = SerialTransport(device)
     t.enter_raw_repl()
     t.exec("import os")
@@ -106,9 +107,13 @@ def list_targets(args, exclude_devices):
         for device in args:
             for p in valid_serial_ports:
                 if device == p.device:
-                    if detect_octoprobe(device):
-                        print(f"{device} Octoprobe infrastructure device")
-                    targets.append(Target(device, p.serial_number))
+                    try:
+                        if detect_octoprobe(device):
+                            print(f"{device} Octoprobe infrastructure device")
+                        targets.append(Target(device, p.serial_number))
+                    except TransportError:
+                        print(f"{device} could not connect!")
+                        continue
                     break
             else:
                 print(f"{device} not found")
@@ -120,9 +125,13 @@ def list_targets(args, exclude_devices):
                 continue
             if p.device in exclude_devices:
                 continue
-            if detect_octoprobe(p.device):
-                # If no devices specified, skip Octoprobe infrastructure.
-                print(f"{p.device} Octoprobe infrastructure device, skipping")
+            try:
+                if detect_octoprobe(p.device):
+                    # If no devices specified, skip Octoprobe infrastructure.
+                    print(f"{p.device} Octoprobe infrastructure device, skipping")
+                    continue
+            except TransportError:
+                print(f"{p.device} could not connect!")
                 continue
             targets.append(Target(p.device, p.serial_number))
     return targets