diff --git a/History.md b/History.md
index a829860d..4e083294 100644
--- a/History.md
+++ b/History.md
@@ -8,7 +8,8 @@ allow to add includedNotes with type
 - 631  multiple invoice referenced documents
 - 629
 - 630 #296 #565
-- 
+- 657
+- 658
 
 2.15.2
 =======
diff --git a/library/src/main/java/org/mustangproject/Contact.java b/library/src/main/java/org/mustangproject/Contact.java
index cead6f86..39ef8aa2 100644
--- a/library/src/main/java/org/mustangproject/Contact.java
+++ b/library/src/main/java/org/mustangproject/Contact.java
@@ -114,7 +114,9 @@ public class Contact implements IZUGFeRDExportableContact {
 				if (currentItemNode.getLocalName() != null) {
 
 					if (currentItemNode.getLocalName().equals("PersonName")/*CII*/||currentItemNode.getLocalName().equals("Name")/*UBL*/) {
-						setName(currentItemNode.getFirstChild().getNodeValue());
+						if (currentItemNode.getFirstChild()!=null) {
+							setName(currentItemNode.getFirstChild().getNodeValue());
+						}
 					}
 					if (currentItemNode.getLocalName().equals("TelephoneUniversalCommunication")) { /*CII*/
 						NodeList tel = currentItemNode.getChildNodes();
diff --git a/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD2PullProvider.java b/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD2PullProvider.java
index caff7b6c..2903d81d 100644
--- a/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD2PullProvider.java
+++ b/library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD2PullProvider.java
@@ -737,7 +737,7 @@ public class ZUGFeRD2PullProvider implements IXMLProvider {
 		}
 
 		if ((trans.getZFCharges() != null) && (trans.getZFCharges().length > 0)) {
-			if (profile == Profiles.getByName("XRechnung")) {
+			if ((profile == Profiles.getByName("XRechnung")) || (profile == Profiles.getByName("EN16931")) || (profile == Profiles.getByName("EXTENDED")))  {
 				for (IZUGFeRDAllowanceCharge charge : trans.getZFCharges()) {
 					xml += "<ram:SpecifiedTradeAllowanceCharge>" +
 						"<ram:ChargeIndicator>" +