diff --git a/client/apps/public/Datasets/v2/datasets/ResolveTaxons.go b/client/apps/public/Datasets/v2/datasets/ResolveTaxons.go
index 5080754..9239388 100644
--- a/client/apps/public/Datasets/v2/datasets/ResolveTaxons.go
+++ b/client/apps/public/Datasets/v2/datasets/ResolveTaxons.go
@@ -139,7 +139,13 @@ func (apiService *taxonAutosuggestApi) GetMetadata(taxId string, returnedContent
 			ReturnedContent: &returnedContent,
 		},
 	).Execute()
-
+	if err != nil {
+        return nil, false, err
+    }
+    if result == nil {
+         return nil, false, fmt.Errorf("empty response from taxonomy service")
+    }
+	
 	hasResults := (result.TaxonomyNodes != nil) && (len(result.TaxonomyNodes) == 1) && ((result.TaxonomyNodes)[0].Taxonomy != nil)
 	return result, hasResults, err
 }