From 03eba76f00ee7dbf1525ad700799c155e8a856ea Mon Sep 17 00:00:00 2001
From: Francis Reat <francis.reat@hardis-group.com>
Date: Fri, 17 Jul 2026 11:35:48 +0200
Subject: [PATCH] SCPN1-11501

(cherry picked from commit 01c3e6b37da9eaa43eb247e951513f234d3c991e)
(cherry picked from commit 38c64cf1476206786a64d7ed7547da2912f9395e)
---
 RFXtoRP_RfxConfigurationRp.ftl | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/RFXtoRP_RfxConfigurationRp.ftl b/RFXtoRP_RfxConfigurationRp.ftl
index 1b19bf7..38ba292 100644
--- a/RFXtoRP_RfxConfigurationRp.ftl
+++ b/RFXtoRP_RfxConfigurationRp.ftl
@@ -24,8 +24,11 @@
 <#noparse><#assign number_of_litres_unit_rfx   = volume_unit_KV_rfx[</#noparse>"${file.measurement_unit.litres_number}"<#noparse>]!"CUBIC_DECIMETER"></#noparse>
 
 
-
+<#if JsonUtil.isValidTimeZone(file.author_time_zone!"Europe/Paris")>
 <#noparse><#assign time_zone_rfx        = </#noparse>"${file.author_time_zone!"Europe/Paris"}<#noparse>"></#noparse>
+<#else>
+<#stop "author_time_zone ${file.author_time_zone} is invalid" />
+</#if>
 <#noparse><#assign time_zone_offset_rfx = </#noparse>"${file.time_zone_offset!"+01:00"}<#noparse>"></#noparse>