diff --git a/RFXtoRP_HsrPrepa_GoodsPrepared.ftl b/RFXtoRP_HsrPrepa_GoodsPrepared.ftl
index c5373d9..dcb0278 100644
--- a/RFXtoRP_HsrPrepa_GoodsPrepared.ftl
+++ b/RFXtoRP_HsrPrepa_GoodsPrepared.ftl
@@ -38,20 +38,22 @@
             </#if> 
         <#else>
            "ContainerType": "${despatched_ipg.hd_type_code}",
-           <#list preparation_line.despatched_hds_list?filter(j ->j.handling_device_number==despatched_ipg.handling_device_number) as dimensionHU>
-            "Length": {
-              "Unit": "${length_unit_rfx}",
-              "Value": "${dimensionHU.hd_type_depth}"
+           <#if preparation_line.despatched_hds_list??>
+            <#list preparation_line.despatched_hds_list?filter(j ->j.handling_device_number==despatched_ipg.hd_number) as dimensionHU>
+              "Length": {
+                "Unit": "${length_unit_rfx}",
+                "Value": "${dimensionHU.hd_type_depth}"
               },
               "Weight": {
-              "Unit": "${weight_unit_rfx}",
-              "Value": "${dimensionHU.hd_gross_weight}"
+                "Unit": "${weight_unit_rfx}",
+                "Value": "${dimensionHU.hd_gross_weight}"
               },
               "Width": {
-              "Unit": "${length_unit_rfx}",
-              "Value": "${dimensionHU.hd_type_width}"
+                "Unit": "${length_unit_rfx}",
+                "Value": "${dimensionHU.hd_type_width}"
               } 
-              </#list>
+            </#list>
+          </#if>
         </#if>
       },