diff --git a/generic/management/commands/checkdicoms.py b/generic/management/commands/checkdicoms.py
index 60d86f5b..648fe950 100644
--- a/generic/management/commands/checkdicoms.py
+++ b/generic/management/commands/checkdicoms.py
@@ -35,12 +35,13 @@ class Command(BaseCommand):
             site_codes = ("ref", "rk9", "ra9", "rh8", "rbz", "rba")
 
             for code in site_codes:
-                for s in (ds.PatientsID, ds.AccessionNumber):
-                    try:
+                # TODO rewrite
+                try:
+                    for s in (ds.PatientsID, ds.AccessionNumber):
                         if code in s:
                             self.stdout.write(self.style.WARNING(f"Identifiable dicom {file}"))
-                    except AttributeError:
-                        self.stdout.write(self.style.WARNING(f"Bad dicom {file}"))
+                except AttributeError:
+                    self.stdout.write(self.style.WARNING(f"Bad dicom {file}"))