diff --git a/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD2PullProvider.java b/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD2PullProvider.java
index 4e254a6e..1dd8e819 100644
--- a/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD2PullProvider.java
+++ b/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD2PullProvider.java
@@ -160,29 +160,31 @@ public class ZUGFeRD2PullProvider implements IXMLProvider {
}
if ((party.getContact() != null) && (isSender || profile == Profiles.getByName("EN16931") || profile == Profiles.getByName("Extended") || profile == Profiles.getByName("XRechnung"))) {
- xml += "";
+ String definedTradeContactXML = "";
if (party.getContact().getName() != null) {
- xml += ""
+ definedTradeContactXML += ""
+ XMLTools.encodeXML(party.getContact().getName())
+ "";
}
if (party.getContact().getPhone() != null) {
- xml += ""
+ definedTradeContactXML += ""
+ XMLTools.encodeXML(party.getContact().getPhone()) + ""
+ "";
}
if ((party.getContact().getFax() != null) && (profile == Profiles.getByName("Extended"))) {
- xml += ""
+ definedTradeContactXML += ""
+ XMLTools.encodeXML(party.getContact().getFax()) + ""
+ "";
}
if (party.getContact().getEMail() != null) {
- xml += ""
+ definedTradeContactXML += ""
+ XMLTools.encodeXML(party.getContact().getEMail()) + ""
+ "";
}
- xml += "";
+ if (!definedTradeContactXML.isEmpty()) {
+ xml += "" + definedTradeContactXML + "";
+ }
}
xml += "";