diff --git a/dfg/dfgproposal.cls b/dfg/dfgproposal.cls
index 5efdaca..70e1610 100644
--- a/dfg/dfgproposal.cls
+++ b/dfg/dfgproposal.cls
@@ -30,11 +30,10 @@
 {\LARGE\textbf{\prop@gen@title}}\\[.3cm]
 \ifx\prop@gen@acronym\@empty\else{\LARGE Acronym: {\prop@gen@acronym}}\\[.2cm]\fi
 {\large\today}\\[1em]
-\message{XXXXXX PIs: \the@PIs}
 \begin{tabular}{c*{\the@PIs}{c}}
-\prop@tl\prop@gen@PIs{\pdataref{PI}\tl@ext{name}}\\
-\prop@tl\prop@gen@PIs{\pdataref{PI}\tl@ext{affiliation}}\\
-\prop@tl\prop@gen@PIs{\pdataref{PI}\tl@ext{dept}}\\
+\prop@tl\prop@gen@PIs{\pdataref@safe{PI}\tl@ext{name}}\\
+\prop@tl\prop@gen@PIs{\pdataref@safe{PI}\tl@ext{affiliation}}\\
+\prop@tl\prop@gen@PIs{\pdataref@safe{PI}\tl@ext{dept}}\\
 \end{tabular}\\[2cm]
 \end{center}
 \ifgeneral
diff --git a/dfg/dfgproposal.dtx b/dfg/dfgproposal.dtx
index 5a33c4a..adb7ea7 100644
--- a/dfg/dfgproposal.dtx
+++ b/dfg/dfgproposal.dtx
@@ -298,9 +298,9 @@
 \ifx\prop@gen@acronym\@empty\else{\LARGE Acronym: {\prop@gen@acronym}}\\[.2cm]\fi
 {\large\today}\\[1em]
 \begin{tabular}{c*{\the@PIs}{c}}
-\prop@tl\prop@gen@PIs{\pdataref{PI}\tl@ext{name}}\\
-\prop@tl\prop@gen@PIs{\pdataref{PI}\tl@ext{affiliation}}\\
-\prop@tl\prop@gen@PIs{\pdataref{PI}\tl@ext{dept}}\\
+\prop@tl\prop@gen@PIs{\pdataref@safe{PI}\tl@ext{name}}\\
+\prop@tl\prop@gen@PIs{\pdataref@safe{PI}\tl@ext{affiliation}}\\
+\prop@tl\prop@gen@PIs{\pdataref@safe{PI}\tl@ext{dept}}\\
 \end{tabular}\\[2cm]
 \end{center}
 \ifgeneral 
diff --git a/dfg/dfgproposal.pdf b/dfg/dfgproposal.pdf
index 967d115..3f36e03 100644
Binary files a/dfg/dfgproposal.pdf and b/dfg/dfgproposal.pdf differ