diff --git a/RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl b/RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl
index 6c72e5d..63a606f 100644
--- a/RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl
+++ b/RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl
@@ -140,6 +140,8 @@
 							<#stop "planned_unloading_start_datetime field of appointmend is not initialized" >
 						</#if>
 						"StartDateTime": "${carrier_apt.planned_unloading_start_datetime}"
+					<#else>
+						<#stop "Appointment type not supported" >
 					</#if>
 				</#if>
 			</#if>
diff --git a/RFXtoRP_HsrCarrierApt_UpdateAppointment.ftl b/RFXtoRP_HsrCarrierApt_UpdateAppointment.ftl
index 1f40a65..dad33e2 100644
--- a/RFXtoRP_HsrCarrierApt_UpdateAppointment.ftl
+++ b/RFXtoRP_HsrCarrierApt_UpdateAppointment.ftl
@@ -134,7 +134,12 @@
 			   		"StartDateTime": "${carrier_apt.planned_load_start_datetime}"
 				<#else>
 					<#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true">
-						<#stop "Not managed">
+						<#if carrier_apt.planned_unloading_start_datetime?starts_with("00") || carrier_apt.planned_unloading_start_datetime?contains("-00-")>
+							<#stop "planned_unloading_start_datetime field of appointmend is not initialized" >
+						</#if>
+						"StartDateTime": "${carrier_apt.planned_unloading_start_datetime}"
+					<#else>
+						<#stop "Appointment type not supported" >
 					</#if>
 				</#if>
 			</#if>
diff --git a/RFXtoRP_HsrCarrierApt_UpdateSlotAppointment.ftl b/RFXtoRP_HsrCarrierApt_UpdateSlotAppointment.ftl
index b8a1d02..419ee57 100644
--- a/RFXtoRP_HsrCarrierApt_UpdateSlotAppointment.ftl
+++ b/RFXtoRP_HsrCarrierApt_UpdateSlotAppointment.ftl
@@ -73,7 +73,8 @@
 							<#stop "planned_unloading_start_datetime field of appointmend is not initialized" >
 						</#if>
 						"StartDateTime": "${carrier_apt.planned_unloading_start_datetime}"
-				</#if>
+					<#else>
+						<#stop "Appointment type not supported" >
 			</#if>
 		</#if>
 		}]