diff --git a/osmclient/sol005/cluster.py b/osmclient/sol005/cluster.py
index e5f1614fbeea7d5d5f0f4380c07a39e3dedebf38..322576336986bee5962eafa465fc64a53120f132 100644
--- a/osmclient/sol005/cluster.py
+++ b/osmclient/sol005/cluster.py
@@ -116,6 +116,10 @@ class Cluster(GenericOSMAPIObject):
         # Complete cluster info with vim_account name and vim_type
         vim_list = self._client.vim.list()
         self._logger.debug(f"VIM list: {vim_list}")
+        if not vim_list:
+            self._logger.warning(
+                "Could not complete cluster info with VIM account info"
+            )
         for item in cluster_list1:
             vim_id = item["vim_account"]
             vim_name, vim_type = next(
@@ -124,7 +128,7 @@ class Cluster(GenericOSMAPIObject):
                     for vim_item in vim_list
                     if vim_item["_id"] == vim_id or vim_item["name"] == vim_id
                 ),
-                None,
+                (None, None),
             )
             item["vim_account"] = f"{vim_name} ({vim_type})"
         return cluster_list1