diff --git a/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmAntragstellerHeaderMapper.java b/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmAntragstellerHeaderMapper.java
index 1e43da915797dd76ab9b6295e3d26fbc0a0ccecf..4d2f5ef1528095ef8366e6db9e408fcf572587f4 100644
--- a/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmAntragstellerHeaderMapper.java
+++ b/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/afm/AfmAntragstellerHeaderMapper.java
@@ -6,6 +6,7 @@ import static org.apache.commons.lang3.StringUtils.*;
 import java.util.Collections;
 import java.util.Map;
 
+import org.apache.commons.collections.MapUtils;
 import org.springframework.stereotype.Component;
 
 import de.ozgcloud.eingang.common.errorhandling.TechnicalException;
@@ -32,16 +33,16 @@ public class AfmAntragstellerHeaderMapper {
 
 	Antragsteller buildAntragsteller(Map<String, Object> headers) {
 		return Antragsteller.builder()
-				.postfachId((String) headers.get(ServiceKontoBuildHelper.KEY_BAYERN_ID_POSTFACH_ID))
-				.vorname((String) headers.get(KEY_VORNAME))
-				.nachname((String) headers.get(KEY_NACHNAME))
-				.geburtsname((String) headers.get(KEY_GEBURTSNAME))
-				.geburtsort((String) headers.get(KEY_GEBURTSORT))
-				.email((String) headers.get(KEY_EMAIL))
-				.telefon((String) headers.get(KEY_TELEFON))
-				.strasse((String) headers.get(KEY_STRASSE))
-				.plz((String) headers.get(KEY_PLZ))
-				.ort((String) headers.get(KEY_ORT))
+				.postfachId(MapUtils.getString(headers, ServiceKontoBuildHelper.KEY_BAYERN_ID_POSTFACH_ID))
+				.vorname(MapUtils.getString(headers, KEY_VORNAME))
+				.nachname(MapUtils.getString(headers, KEY_NACHNAME))
+				.geburtsname(MapUtils.getString(headers, KEY_GEBURTSNAME))
+				.geburtsort(MapUtils.getString(headers, KEY_GEBURTSORT))
+				.email(MapUtils.getString(headers, KEY_EMAIL))
+				.telefon(MapUtils.getString(headers, KEY_TELEFON))
+				.strasse(MapUtils.getString(headers, KEY_STRASSE))
+				.plz(MapUtils.getString(headers, KEY_PLZ))
+				.ort(MapUtils.getString(headers, KEY_ORT))
 				.build();
 	}