diff --git a/eurostat_to_dbnomics.py b/eurostat_to_dbnomics.py
index 7344094662156ecff479a73a102128f4f50d688d..3da0538e77a3a2a0e7b340d14066a4ff6138890a 100755
--- a/eurostat_to_dbnomics.py
+++ b/eurostat_to_dbnomics.py
@@ -337,7 +337,7 @@ def toc_xml_element_to_json(source_repo, source_tree, repo, dataset_pair_by_data
 
                 dataset_tree = find_git_object(source_repo, source_tree, ["data", dataset_code])
                 sdmx_blob = source_repo[dataset_tree[sdmx_entry_name][1]] \
-                    if dataset_tree is not None \
+                    if dataset_tree is not None and sdmx_entry_name in dataset_tree \
                     else None
                 if sdmx_blob is not None:
                     if dataset_code not in processed_datasets_codes:
@@ -371,7 +371,7 @@ def toc_xml_element_to_json(source_repo, source_tree, repo, dataset_pair_by_data
                         processed_datasets_codes.add(dataset_code)
                         return categories_tree_dataset_json
                 else:
-                    log.debug("SDMX file %s was not downloaded, skipping", sdmx_blob_name)
+                    log.error("SDMX file %s is missing, skipping", sdmx_blob_name)
 
     return None