diff --git a/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/FootnoteTransformation.xtend b/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/FootnoteTransformation.xtend
index 60b34c4c6..8dbe247d0 100644
--- a/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/FootnoteTransformation.xtend
+++ b/java/bundles/org.eclipse.set.feature.table.pt1/src/org/eclipse/set/feature/table/pt1/FootnoteTransformation.xtend
@@ -68,10 +68,10 @@ class FootnoteTransformation {
 	def void transform(Basis_Objekt object, TableRow row) {
 		this.row = row
 		// Direct attachment notes
-		object?.IDBearbeitungsvermerk?.map[value]?.toSet?.forEach [
+		object?.IDBearbeitungsvermerk?.filterNull?.map[value]?.toSet?.forEach [
 			object.addFootnote(it)
 		]
-		object?.referenceFootnotes?.map[value]?.toSet?.forEach [
+		object?.referenceFootnotes?.filterNull?.map[value]?.toSet?.forEach [
 			object.addFootnote(it)
 		]