diff --git a/.bin/Scripts/functions/hw_diags.py b/.bin/Scripts/functions/hw_diags.py
index a5fc5e5d..f5235111 100644
--- a/.bin/Scripts/functions/hw_diags.py
+++ b/.bin/Scripts/functions/hw_diags.py
@@ -1012,7 +1012,9 @@ def run_hw_tests(state):
     # Recheck attributes
     if state.tests['NVMe / SMART']['Enabled']:
       for test_obj in state.tests['NVMe / SMART']['Objects']:
-        run_nvme_smart_tests(state, test_obj, update_mode=True)
+        if test_obj.dev is not None:
+          # dev == None for the 'N/A' lines set above
+          run_nvme_smart_tests(state, test_obj, update_mode=True)
 
   except GenericAbort:
     # Cleanup