diff --git a/app/pe/pe_etudiant.py b/app/pe/pe_etudiant.py
index 126f112f..9e79e8d6 100644
--- a/app/pe/pe_etudiant.py
+++ b/app/pe/pe_etudiant.py
@@ -417,14 +417,19 @@ def annee_diplome(identite: Identite) -> int:
 
     Returns:
         L'année prévue de sa diplômation
-
-    NOTE: Pourrait être déplacé dans app.models.etudiants.Identite
     """
     formsemestres = identite.get_formsemestres()
+
     if formsemestres:
-        return max(
-            [pe_comp.get_annee_diplome_semestre(sem_base) for sem_base in formsemestres]
-        )
+        dates_possibles_diplome = []
+        for sem_base in formsemestres:
+            annee = pe_comp.get_annee_diplome_semestre(sem_base)
+            if annee:
+                dates_possibles_diplome(annee)
+        if dates_possibles_diplome:
+            return max(dates_possibles_diplome)
+        else:
+            None
     else:
         return None
 
diff --git a/app/pe/pe_jury.py b/app/pe/pe_jury.py
index 790b10f8..6873a5be 100644
--- a/app/pe/pe_jury.py
+++ b/app/pe/pe_jury.py
@@ -266,13 +266,18 @@ class JuryPE(object):
             cursus = self.etudiants.cursus[etudid]
             formsemestres = cursus["formsemestres"]
 
+            if cursus["diplome"]:
+                diplome = cursus["diplome"]
+            else:
+                diplome = "indéterminé"
+
             administratif[etudid] = {
                 "Nom": etudiant.nom,
                 "Prenom": etudiant.prenom,
                 "Civilite": etudiant.civilite_str,
                 "Age": pe_comp.calcul_age(etudiant.date_naissance),
                 "Date d'entree": cursus["entree"],
-                "Date de diplome": cursus["diplome"],
+                "Date de diplome": diplome,
                 "Nbre de semestres": len(formsemestres),
             }