diff --git a/RFXtoRP_HsrCarrierApt_BookingForceBookAppointment.ftl b/RFXtoRP_HsrCarrierApt_BookingForceBookAppointment.ftl
index 43307e6..011f49f 100644
--- a/RFXtoRP_HsrCarrierApt_BookingForceBookAppointment.ftl
+++ b/RFXtoRP_HsrCarrierApt_BookingForceBookAppointment.ftl
@@ -8,7 +8,7 @@
 		    "RefDate": {
 				"DateTime": "${creation_datetime}",
 				"AuthorTimeZone": "${time_zone_rfx}"
-			  },	
+			  },
 		<#if carrier_apt.constant_appointment?? && carrier_apt.constant_appointment== "true">
 			<#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
 				"RefID": "${carrier_apt.appointment_reference?json_string}-${carrier_apt.year_number}-${carrier_apt.appointment_number}",
@@ -85,8 +85,7 @@
 							<#stop "planned_unloading_start_datetime or planned_load_end_datetime field of appointmend are not valid" >
 						</#if>
 					<#else>
-						<#assign appointmentType = AppointmentType.APPOINTMENT_TYPE_UNKNOWN>
-						<#assign duration = 0 />
+						<#stop "Appointment type not supported" >
 					</#if>
 				</#if>
 			</#if>
@@ -98,7 +97,7 @@
 			<#include "RFXtoRP_HsrCarrierApt_MetadataAppointment.ftl">,
 			<#if carrier_apt.physical_receipt_list??  && (carrier_apt.physical_receipt_list?filter(l ->l??)?size != 0)>
 				"Unloading" :
-					{ 
+					{
 						"Projects" : [{
 							"Commissions": [
 									<#list carrier_apt.physical_receipt_list?filter(l ->l??) as physical_receipt>
@@ -121,13 +120,13 @@
 					},
 			<#else>
 				"Loading" :
-					{ 
+					{
 						"Projects" : [{
 							"Commissions": [{
 								"ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}",
 								"ProjectID": "${projectRP}",
 								"PartnerAppID": "${partnerApplicationRP}",
-								"OrganisationID": "${organisationRP}"		
+								"OrganisationID": "${organisationRP}"
 						}],
 							"ProjectID"	: "${projectRP}:${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}"
 					}]
diff --git a/RFXtoRP_HsrCarrierApt_BookingWMSUpdateAppointment.ftl b/RFXtoRP_HsrCarrierApt_BookingWMSUpdateAppointment.ftl
index c1dc1bb..cb731ac 100644
--- a/RFXtoRP_HsrCarrierApt_BookingWMSUpdateAppointment.ftl
+++ b/RFXtoRP_HsrCarrierApt_BookingWMSUpdateAppointment.ftl
@@ -9,7 +9,7 @@
 		     "RefDate": {
 				"DateTime": "${update_datetime}",
 				"AuthorTimeZone": "${time_zone_rfx}"
-			  },	
+			  },
 		<#if carrier_apt.constant_appointment?? && carrier_apt.constant_appointment== "true">
 			<#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
 				"RefID": "${carrier_apt.appointment_reference?json_string}-${carrier_apt.year_number}-${carrier_apt.appointment_number}",
@@ -85,17 +85,16 @@
 						<#stop "planned_unloading_start_datetime or planned_load_end_datetime field of appointmend are not valid" >
 					</#if>
 				<#else>
-					<#assign appointmentType = AppointmentType.APPOINTMENT_TYPE_UNKNOWN>
-					<#assign duration = 0 />
+					<#stop "Appointment type not supported" >
 				</#if>
 			</#if>
 		</#if>
 		"TimeZone":"${time_zone_rfx}",
 		<#if carrier_apt.physical_receipt_list??  && (carrier_apt.physical_receipt_list?filter(l ->l??)?size != 0) && ((carrier_apt.unloading_appointment =="true" && carrier_apt.load_appointment =="false") || (carrier_apt.unloading_appointment =="false" && carrier_apt.load_appointment =="true"))>
 		"Unloading" :
-			{ 
+			{
 				"Projects" : [
-				{	
+				{
 					"Commissions": [
 					<#list carrier_apt.physical_receipt_list?filter(l ->l??) as physical_receipt>
 					{