diff --git a/.bin/Scripts/functions/hw_diags.py b/.bin/Scripts/functions/hw_diags.py
index 9cfe13d7..cd7c4303 100644
--- a/.bin/Scripts/functions/hw_diags.py
+++ b/.bin/Scripts/functions/hw_diags.py
@@ -1002,7 +1002,11 @@ def run_hw_tests(state):
 
   # Get ticket ID and name
   if not state.ost.disabled:
-    state.ticket_id, state.ticket_name = state.ost.get_ticket_details()
+    try:
+      state.ticket_id, state.ticket_name = state.ost.get_ticket_details()
+    except TypeError:
+      # Happens if connection fails and retry is not attempted
+      pass
 
   # Run disk safety checks (if necessary)
   _disk_tests_enabled = False
diff --git a/.bin/Scripts/hw-diags-menu b/.bin/Scripts/hw-diags-menu
index fa7f0cd8..58bf5280 100755
--- a/.bin/Scripts/hw-diags-menu
+++ b/.bin/Scripts/hw-diags-menu
@@ -50,7 +50,7 @@ if __name__ == '__main__':
           global_vars=global_vars)
 
       # Done
-      sleep(10)
+      sleep(1)
       pause('Press Enter to exit...')
       exit_script(1)