From b6d3ddc1c8f288e98d68f528334c8c61394f3ecd Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Thu, 5 Dec 2024 14:54:47 +0100
Subject: [PATCH] more safeguard for invalid containers

---
 client/ayon_core/tools/loader/control.py        | 14 +++++++-------
 .../tools/sceneinventory/models/containers.py   | 17 +++++++++++------
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/client/ayon_core/tools/loader/control.py b/client/ayon_core/tools/loader/control.py
index 412e6677f0..4ce220f282 100644
--- a/client/ayon_core/tools/loader/control.py
+++ b/client/ayon_core/tools/loader/control.py
@@ -372,14 +372,14 @@ class LoaderController(BackendLoaderController, FrontendLoaderController):
 
             repre_ids = set()
             for container in containers:
-                repre_id = container.get("representation")
-                # Ignore invalid representation ids.
-                # - invalid representation ids may be available if e.g. is
-                #   opened scene from OpenPype whe 'ObjectId' was used instead
-                #   of 'uuid'.
-                # NOTE: Server call would crash if there is any invalid id.
-                #   That would cause crash we won't get any information.
                 try:
+                    repre_id = container.get("representation")
+                    # Ignore invalid representation ids.
+                    # - invalid representation ids may be available if e.g. is
+                    #   opened scene from OpenPype whe 'ObjectId' was used instead
+                    #   of 'uuid'.
+                    # NOTE: Server call would crash if there is any invalid id.
+                    #   That would cause crash we won't get any information.
                     uuid.UUID(repre_id)
                     repre_ids.add(repre_id)
                 except (ValueError, TypeError, AttributeError):
diff --git a/client/ayon_core/tools/sceneinventory/models/containers.py b/client/ayon_core/tools/sceneinventory/models/containers.py
index f25ef2b94c..c761121d4d 100644
--- a/client/ayon_core/tools/sceneinventory/models/containers.py
+++ b/client/ayon_core/tools/sceneinventory/models/containers.py
@@ -350,12 +350,14 @@ class ContainersModel:
             return
 
         host = self._controller.get_host()
-        if isinstance(host, ILoadHost):
-            containers = list(host.get_containers())
-        elif hasattr(host, "ls"):
-            containers = list(host.ls())
-        else:
-            containers = []
+        containers = []
+        try:
+            if isinstance(host, ILoadHost):
+                containers = list(host.get_containers())
+            elif hasattr(host, "ls"):
+                containers = list(host.ls())
+        except Exception:
+            self._log.error("Failed to get containers", exc_info=True)
 
         container_items = []
         containers_by_id = {}
@@ -363,6 +365,9 @@ class ContainersModel:
         invalid_ids_mapping = {}
         current_project_name = self._controller.get_current_project_name()
         for container in containers:
+            if not container:
+                continue
+
             try:
                 item = ContainerItem.from_container_data(
                     current_project_name, container)