diff --git a/check-sr-results.py b/check-sr-results.py
index ebdc5883787beb1365ccb88152a4a727725b6d8b..c9fd8598b3ca97b48163f508a500a6771e998d4f 100755
--- a/check-sr-results.py
+++ b/check-sr-results.py
@@ -772,8 +772,8 @@ def check_uefi_sniff(filename):
     # Open the file with the proper encoding and look for ESPs
     for i, line in enumerate(logreader.LogReader(filename)):
         m = re.match(
-            r'\d+: DevicePath\([^\)]+\) +(/\S+) BlockIO\([^\)]+\).* '
-            r'EFISystemPartition\([^\)]+\)', line)
+            r'\S[0-9a-fA-F]+: DevicePath\([^\)]+\) +(/\S+) '
+            r'BlockIO\([^\)]+\).* EFISystemPartition\([^\)]+\)', line)
 
         if m:
             logging.debug(f"ESP match line {i + 1}, `{line}'")
@@ -1220,7 +1220,7 @@ def deferred_check_uefi_logs_esp():
     # actually did.
     for k, v in filenames.items():
         if not v:
-            logging.error(f"`{filename}' {red}did not have an ESP{normal}")
+            logging.error(f"`{k}' {red}did not have an ESP{normal}")
             stats.inc_error()
 
     return stats