diff --git a/bpdm-gate/src/main/kotlin/org/eclipse/tractusx/bpdm/gate/service/BusinessPartnerMappings.kt b/bpdm-gate/src/main/kotlin/org/eclipse/tractusx/bpdm/gate/service/BusinessPartnerMappings.kt
index f42bc1a1d..516187ba4 100644
--- a/bpdm-gate/src/main/kotlin/org/eclipse/tractusx/bpdm/gate/service/BusinessPartnerMappings.kt
+++ b/bpdm-gate/src/main/kotlin/org/eclipse/tractusx/bpdm/gate/service/BusinessPartnerMappings.kt
@@ -115,7 +115,7 @@ class BusinessPartnerMappings {
 
     private fun toPostalAddressOutputDto(entity: PostalAddress) =
         BusinessPartnerPostalAddressOutputDto(
-            addressType = entity.addressType,
+            addressType = entity.addressType!!, //An entity of stage output is expected to have a non-null addressType
             physicalPostalAddress = entity.physicalPostalAddress.let(::toPhysicalPostalAddressDto),
             alternativePostalAddress = entity.alternativePostalAddress?.let(::toAlternativePostalAddressDto)
         )