diff --git a/src/3.2.3_plancher_haut.js b/src/3.2.3_plancher_haut.js
index 1b8478c..88b2973 100644
--- a/src/3.2.3_plancher_haut.js
+++ b/src/3.2.3_plancher_haut.js
@@ -109,14 +109,17 @@ export default function calc_ph(ph, zc, pc_id, ej) {
       di.uph = Math.min(di.uph, di.uph0);
       break;
     case 'année de construction saisie (table forfaitaire)': {
-      // i.e l'année d'isolation n'est pas connue
       let pi_id = pc_id;
-      const pc = enums.periode_construction[pc_id];
-      switch (pc) {
-        case 'avant 1948':
-        case '1948-1974':
-          pi_id = getKeyByValue(enums.periode_isolation, '1975-1977');
-          break;
+      if (de.enum_periode_isolation_id) {
+        pi_id = de.enum_periode_isolation_id;
+      } else {
+        const pc = enums.periode_construction[pc_id];
+        switch (pc) {
+          case 'avant 1948':
+          case '1948-1974':
+            pi_id = getKeyByValue(enums.periode_isolation, '1975-1977');
+            break;
+        }
       }
       calc_uph0(di, de, du);
       const tv_uph_avant = de.tv_uph_id;
diff --git a/src/3_deperdition.js b/src/3_deperdition.js
index c98bf70..13e276a 100644
--- a/src/3_deperdition.js
+++ b/src/3_deperdition.js
@@ -65,11 +65,11 @@ export function Upt(o) {
 export default function calc_deperdition(cg, zc, th, ej, enveloppe, logement) {
   const pc = cg.enum_periode_construction_id;
 
-  const mur_list = enveloppe.mur_collection.mur;
+  const mur_list = enveloppe.mur_collection.mur || [];
   const pb_list = enveloppe.plancher_bas_collection.plancher_bas || [];
   const ph_list = enveloppe.plancher_haut_collection.plancher_haut || [];
-  const bv_list = enveloppe.baie_vitree_collection.baie_vitree || [];
   const porte_list = enveloppe.porte_collection.porte || [];
+  const bv_list = enveloppe.baie_vitree_collection.baie_vitree || [];
   const pt_list = enveloppe.pont_thermique_collection.pont_thermique || [];
   const vt_list = logement.ventilation_collection.ventilation;