diff --git a/emgapi/metagenomics_exchange.py b/emgapi/metagenomics_exchange.py
index 77cc030d5..55ad381a3 100644
--- a/emgapi/metagenomics_exchange.py
+++ b/emgapi/metagenomics_exchange.py
@@ -168,6 +168,13 @@ def check_analysis(self, mgya: str, sequence_accession: str, metadata=None):
             logging.info(f"{mgya} does not exist in ME")
             return analysis_registry_id, metadata_match
 
+        # TODO: this code needs some refactoring to improve it:
+        """
+        try:
+            found_record = next(item for item in datasets if item.get("sourceID") == mgya)
+        except StopIteration
+            ...
+        """
         sourceIDs = [item.get("sourceID") for item in datasets]
         if mgya in sourceIDs:
             found_record = [item for item in datasets if item.get("sourceID") == mgya][