Merge branch 'feature/OPHKIOS-132' into feature/OPHKIOS-116

Opetushallitus · Feb 6, 2025 · 279beff · 279beff
2 parents 5eacb78 + 6f9afb2
commit 279beff
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/backend/vkt/src/main/java/fi/oph/vkt/view/ExamEventXlsxDataRowUtil.java b/backend/vkt/src/main/java/fi/oph/vkt/view/ExamEventXlsxDataRowUtil.java
@@ -104,7 +104,8 @@ private static ExamEventXlsxDataRow createDataRow(
     final Map<String, PersonalData> personalDatas
   ) {
     final String oid = person.getOid();
-    final String ssn = oid != null ? personalDatas.get(oid).getSsn() : null;
+    final PersonalData personalData = personalDatas.get(oid);
+    final String ssn = oid != null && personalData != null ? personalData.getSsn() : null;
 
     ExamEventXlsxDataRow.ExamEventXlsxDataRowBuilder builder = ExamEventXlsxDataRow
       .builder()