diff --git a/src/evidently/core/datasets.py b/src/evidently/core/datasets.py
index 8aff5f315d..ccf5f60d6f 100644
--- a/src/evidently/core/datasets.py
+++ b/src/evidently/core/datasets.py
@@ -566,7 +566,7 @@ def get_classification(self, classification_id: str) -> Optional[Classification]
         """
         item_list = list(filter(lambda x: x.name == classification_id, self.classification or []))
         if len(item_list) == 0:
-            return None
+            raise ValueError("No classification with id {} found".format(classification_id))
         if len(item_list) > 1:
             raise ValueError("More than one classification with id {}".format(classification_id))
         return item_list[0]