diff --git a/TBF/Rig/Elde/ControlBoardDev.cs b/TBF/Rig/Elde/ControlBoardDev.cs
index 32354261d..2f4e0ef72 100644
--- a/TBF/Rig/Elde/ControlBoardDev.cs
+++ b/TBF/Rig/Elde/ControlBoardDev.cs
@@ -120,11 +120,11 @@ namespace TBF.Rig.Elde
         public byte[] MeretRS485Address = new byte[4];
   #endif
         public float[] EtCalib = new float[5] { 1, 1, 1, 1, 1 };
-#elif CEVAK_200 || DN100 || FUZHOU_150 || FUZHOU_300 || IZRAEL_200 || SENTEC
+#elif CEVAK_200 || DN100 || FUZHOU_150 || IZRAEL_200 || SENTEC
         public uint[,] RegValveCalib = new uint[8,2] {{100,500},{100,500},{100,500},{100,500},{100,500},{100,500},{100,500},{100,500}};
 		public byte[] MeretRS485Address = new byte[4];
         public float[] EtCalib = new float[6] { 1, 1, 1, 1, 1, 1 };
-#elif BERLIN || GELSENWASSER || GENESIS || PETERSBURG_200 || PUCHONG_200 || RUM_MOB || SLM_150
+#elif BERLIN || FUZHOU_300 || GELSENWASSER || GENESIS || PETERSBURG_200 || PUCHONG_200 || RUM_MOB || SLM_150
         public uint[,] RegValveCalib = new uint[16, 2] { {100,500}, {100,500}, {100,500}, {100,500}, {100,500}, {100,500}, {100,500}, {100,500}, 
 														 {100,500}, {100,500}, {100,500}, {100,500}, {100,500}, {100,500}, {100,500}, {100,500} };
         public byte[] MeretRS485Address = new byte[4];
diff --git a/TBF/Rig/Elde/ControlComWrap.cs b/TBF/Rig/Elde/ControlComWrap.cs
index be22243e1..a9fd4a476 100644
--- a/TBF/Rig/Elde/ControlComWrap.cs
+++ b/TBF/Rig/Elde/ControlComWrap.cs
@@ -82,7 +82,7 @@ namespace TBF.Rig.Elde
         public UInt128 RRoute { get { return ctrlBrdComponent.rRoute; } }
 #endif
 
-#if ALZIR_25 || BADGER_STREDNA_TRAT || BAHRAIN_50 || CEVAK_200 || DEWA_300 || FEWA_50 || FUZHOU_100 || FILIPINY_50 || GELSENWASSER || GENESIS || HONGKONG_50 || IZRAEL_25 || IZRAEL_50 || JUZNA_AFRIKA_50 || KEMPNO_50 || KRAKOW_50 || LUXEMBURG_40 || MILWAUKEE || PUCHONG_200 || ROMA_200 || SENTEC || TURA_IPERL_NEW || WARSAW_50 || ZAMBIA || ZODINO
+#if ALZIR_25 || BADGER_STREDNA_TRAT || BAHRAIN_50 || CEVAK_200 || DEWA_300 || FEWA_50 || FUZHOU_100 || FUZHOU_300 || FILIPINY_50 || GELSENWASSER || GENESIS || HONGKONG_50 || IZRAEL_25 || IZRAEL_50 || JUZNA_AFRIKA_50 || KEMPNO_50 || KRAKOW_50 || LUXEMBURG_40 || MILWAUKEE || PUCHONG_200 || ROMA_200 || SENTEC || TURA_IPERL_NEW || WARSAW_50 || ZAMBIA || ZODINO
         public uint DivTime(int id) { return ctrlBrdComponent.divTime[id]; }
         public void SetDivLimit(int divNo, uint limLoPct, uint limHiPct)
         {
@@ -115,7 +115,7 @@ namespace TBF.Rig.Elde
         }
         public float DivSamples(int time, int divIx0)
         {
-#if FUZHOU_50 || FUZHOU_150 || FUZHOU_300 || IZRAEL_200 || MUNICH
+#if FUZHOU_50 || FUZHOU_150 || IZRAEL_200 || MUNICH
             return ctrlBrdComponent.DIVSamples[time, 0];
 #else
 			return ctrlBrdComponent.DIVSamples[time, divIx0];
diff --git a/TBF/Rig/Elde/Diverter/Diverter.cs b/TBF/Rig/Elde/Diverter/Diverter.cs
index 498ecdbc1..f1152ef31 100644
--- a/TBF/Rig/Elde/Diverter/Diverter.cs
+++ b/TBF/Rig/Elde/Diverter/Diverter.cs
@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2013-2020 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2022 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
@@ -91,8 +91,10 @@ namespace TBF.Rig.Elde.Diverter
             }
             else
             {
-                log.ErrorFormat("Unable to set {0} ADC levels: RegValveCalib array size={1}, diverter AdcNr={2}",
-                                Name, controlBoard.RegValveCalib.GetLength(0), diverterCfg.AdcNr);
+                string message = string.Format("Cannot save calibration: RegValveCalib[] size={1}, ADC#={2}",
+                                               Name, controlBoard.RegValveCalib.GetLength(0), diverterCfg.AdcNr);
+                log.Error(message);
+                throw new Exception(message);
             }
 		}
 
diff --git a/packages/ControlBoard/Fuzhou300/ControlComponent3U.dll b/packages/ControlBoard/Fuzhou300/ControlComponent3U.dll
index 71e3f256d..d55208191 100644
Binary files a/packages/ControlBoard/Fuzhou300/ControlComponent3U.dll and b/packages/ControlBoard/Fuzhou300/ControlComponent3U.dll differ