diff --git a/libraryBasic/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDImporter.java b/libraryBasic/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDImporter.java
index fa5a4bfd..e9060de1 100644
--- a/libraryBasic/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDImporter.java
+++ b/libraryBasic/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDImporter.java
@@ -259,7 +259,16 @@ public class ZUGFeRDImporter {
 	 * @return the document code
 	 */
 	public String getDocumentCode() {
-		return extractString("//HeaderExchangedDocument/TypeCode");
+		try {
+			if (getVersion() == 1) {
+				return extractString("//HeaderExchangedDocument/TypeCode");
+			} else {
+				return extractString("//ExchangedDocument/TypeCode");
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+			return "";
+		}
 	}
 
 
@@ -458,6 +467,10 @@ public class ZUGFeRDImporter {
 		return s.hasNext() ? s.next() : "";
 	}
 
+	/**
+	 * returns an instance of PostalTradeAddress for SellerTradeParty section
+	 * @return an instance of PostalTradeAddress
+	 */
 	public PostalTradeAddress getSellerTradePartyAddress() {
 
 		NodeList nl = null;
diff --git a/libraryBasic/src/test/java/org/mustangproject/ZUGFeRD/ZF2Test.java b/libraryBasic/src/test/java/org/mustangproject/ZUGFeRD/ZF2Test.java
index 2f2b85ee..6dd1eff1 100644
--- a/libraryBasic/src/test/java/org/mustangproject/ZUGFeRD/ZF2Test.java
+++ b/libraryBasic/src/test/java/org/mustangproject/ZUGFeRD/ZF2Test.java
@@ -207,7 +207,7 @@ public class ZF2Test extends MustangReaderTestCase {
 		// Reading ZUGFeRD
 		assertEquals(zi.getAmount(), "571.04");
 		assertEquals(zi.getHolder(), getOwnOrganisationName());
-
+		assertEquals(zi.getDocumentCode(),"380");
 		assertEquals(zi.getAmount(), "571.04");
 		assertEquals(zi.getBIC(), getTradeSettlementPayment()[0].getOwnBIC());
 		assertEquals(zi.getIBAN(),getTradeSettlementPayment()[0].getOwnIBAN());