diff --git a/recommendations/Recommendations.py b/recommendations/Recommendations.py
index 5e4d1cc3..aa66159b 100644
--- a/recommendations/Recommendations.py
+++ b/recommendations/Recommendations.py
@@ -46,7 +46,8 @@ class Recommendations:
                 rec["co2_equivalent_savings"] = float(property_instance.data["co2-emissions-current"]) - new_carbon
                 rec["heat_demand"] = float(property_instance.data["co2-emissions-current"]) - new_heat_demand
 
-                if rec["sap_points"] is None:
-                    raise ValueError("Sap points missing")
+                if (rec["sap_points"] is None) and (rec["co2_equivalent_savings"] is None) or (
+                    rec["heat_demand"] is None):
+                    raise ValueError("sap points, co2 or heat demand is missing")
 
         return property_recommendations