diff --git a/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl b/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl
index 941f578..c6ad759 100644
--- a/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl
+++ b/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl
@@ -24,7 +24,7 @@
         <#if despatched_ipg.carton_number != "000000000000000000">
            "ContainerType": "${despatched_ipg.carton_type_code?json_string}"
            <#if preparation_line.despatched_cartons_list?? >
-              <#list preparation_line.despatched_cartons_list?filter(l ->l.carton_number==despatched_ipg.carton_number) as dimensionCarton>
+              <#list preparation_line.despatched_cartons_list?filter(l -> l?? && l.carton_number==despatched_ipg.carton_number) as dimensionCarton>
               ,
               "Length": {
               "Unit": "${length_unit_rfx}",
@@ -47,7 +47,7 @@
         <#else>
            "ContainerType": "${despatched_ipg.hd_type_code?json_string}"
            <#if preparation_line.despatched_hds_list??>
-            <#list preparation_line.despatched_hds_list?filter(j ->j.handling_device_number==despatched_ipg.hd_number) as dimensionHU>
+            <#list preparation_line.despatched_hds_list?filter(j -> j?? && j.handling_device_number==despatched_ipg.hd_number) as dimensionHU>
             ,
               "Length": {
                 "Unit": "${length_unit_rfx}",