diff --git a/library/src/main/java/org/mustangproject/Invoice.java b/library/src/main/java/org/mustangproject/Invoice.java
index 0544f0b0..4ada39a9 100644
--- a/library/src/main/java/org/mustangproject/Invoice.java
+++ b/library/src/main/java/org/mustangproject/Invoice.java
@@ -653,7 +653,13 @@ public class Invoice implements IExportableTransaction {
 	}
 
 	public Invoice setPaymentTerms(IZUGFeRDPaymentTerms paymentTerms) {
-		this.paymentTerms = new IZUGFeRDPaymentTerms[] { paymentTerms };
+		if (null != paymentTerms) {
+			this.paymentTerms = new IZUGFeRDPaymentTerms[] { paymentTerms };
+		}
+		else {
+			this.paymentTerms = null;
+		}
+
 		return this;
 	}