diff --git a/scripts/metricsLib/metrics_data_structures.py b/scripts/metricsLib/metrics_data_structures.py
index 4d5c852951..1246dd0f0a 100644
--- a/scripts/metricsLib/metrics_data_structures.py
+++ b/scripts/metricsLib/metrics_data_structures.py
@@ -173,11 +173,8 @@ def hit_metric(self, params=None):
         return response
 
     def get_values(self,params=None, oss_entity=None):
-        try:
-            r = self.hit_metric(params=params)
-        except TimeoutError as e:
-            print(f"Request timeout out  for metric {self.name}: {e}")
-            return {}
+
+        r = self.hit_metric(params=params)
 
         path = oss_entity.get_path_to_resource_data(self.name, fmt=self.format)
 
diff --git a/scripts/metricsLib/oss_metric_entities.py b/scripts/metricsLib/oss_metric_entities.py
index 77e49d209c..3ccfe7f5a2 100644
--- a/scripts/metricsLib/oss_metric_entities.py
+++ b/scripts/metricsLib/oss_metric_entities.py
@@ -149,7 +149,15 @@ def apply_metric_and_store_data(self, metric, *args, **kwargs):
         params = self.get_parameters_for_metric(metric)
 
         kwargs['params'] = params
-        self.store_metrics(metric.get_values(*args, **kwargs))
+
+        try:
+            self.store_metrics(metric.get_values(*args, **kwargs))
+        except TimeoutError as e:
+            print(f"Timeout for repo {self.name} with metric {metric.name}")
+            print(f"Error: {e}")
+        except ConnectionError as e:
+            print(f"Connection error for repo {self.name} with metric {metric.name}")
+            print(f"Error: {e}")
 
 
 class Repository(OSSEntity):