diff --git a/library/delete_old_oci_images.py b/library/delete_old_oci_images.py
index 8b9d1255da..c906797457 100644
--- a/library/delete_old_oci_images.py
+++ b/library/delete_old_oci_images.py
@@ -112,8 +112,13 @@ def main():
         if not resp.ok:
             result["stdout_lines"].append("Failed to get the list of tags for {}".format(repo))
 
-        # For each tag get the maninfest
+
         image = resp.json()
+        # Log the repositories that don't have any tags
+        if image["tags"] is None:
+          result["stdout_lines"].append("{repo} does not have any tags".format(repo))
+          continue
+        # For each tag get the maninfest
         for tag in image["tags"]:
             resp = s.get("{}/v2/{}/manifests/{}".format(registry, repo, tag))
             if not resp.ok: