diff --git a/generic/management/commands/checkdicoms.py b/generic/management/commands/checkdicoms.py
index ce438d02..f35219ef 100644
--- a/generic/management/commands/checkdicoms.py
+++ b/generic/management/commands/checkdicoms.py
@@ -37,11 +37,15 @@ class Command(BaseCommand):
             for code in site_codes:
                 # TODO rewrite
                 try:
-                    for s in (ds.PatientID, ds.AccessionNumber):
-                        if code in s:
-                            self.stdout.write(self.style.WARNING(f"Identifiable dicom {file}"))
+                    if code in ds.PatientId:
+                        self.stdout.write(self.style.WARNING(f"Identifiable dicom {file}"))
                 except AttributeError:
-                    self.stdout.write(self.style.WARNING(f"Bad dicom {file}"))
+                    pass
+                try:
+                    if code in ds.AccessionNumber:
+                        self.stdout.write(self.style.WARNING(f"Identifiable dicom {file}"))
+                except AttributeError:
+                    pass