diff --git a/Common/Hardware/WaterMeter/WaterMeterCore/WaterMeterRegisters/obj/Debug/WaterMeterRegisters.csproj.CoreCompileInputs.cache b/Common/Hardware/WaterMeter/WaterMeterCore/WaterMeterRegisters/obj/Debug/WaterMeterRegisters.csproj.CoreCompileInputs.cache
index 8d4994b0..82bc2c16 100644
--- a/Common/Hardware/WaterMeter/WaterMeterCore/WaterMeterRegisters/obj/Debug/WaterMeterRegisters.csproj.CoreCompileInputs.cache
+++ b/Common/Hardware/WaterMeter/WaterMeterCore/WaterMeterRegisters/obj/Debug/WaterMeterRegisters.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-8fbe991b217e7692af4817ad205b768685aa5a72
+bf6bb8fceb3db5a9977dadc407cf576684bf7127
diff --git a/ServiceFwUpdate/Ui/ServiceFwUpdateSw/FrmServiceFwUpdateSw.cs b/ServiceFwUpdate/Ui/ServiceFwUpdateSw/FrmServiceFwUpdateSw.cs
index 2513f6fb..cf248b61 100644
--- a/ServiceFwUpdate/Ui/ServiceFwUpdateSw/FrmServiceFwUpdateSw.cs
+++ b/ServiceFwUpdate/Ui/ServiceFwUpdateSw/FrmServiceFwUpdateSw.cs
@@ -1456,14 +1456,15 @@ namespace Xylem.ServiceFwUpdate.Ui.ServiceFwUpdateSw
             //         the FW update this is lost in _currentGenesis.InstalledFwVersion and overwritten by the
             //         new version after the FW update!
             // REMIND: Update only allowed if the actual FW version is higher or equal to threshold (Update succeeded)
-            if ((_currentGenesis.Region == "EMEA" &&
+            if (_fwUpdatePowerCorrection != null &&
+                ((_currentGenesis.Region == "EMEA" &&
                   _cordonelFirmwarePackage.FwPackageInfo.Version >= PowCorrConst.EmeaFwThresholdForPowCorr &&
                   _fwUpdatePowerCorrection.ActualFwVersion < PowCorrConst.EmeaFwThresholdForPowCorr &&
                   _currentGenesis.InstalledFwVersion >= PowCorrConst.EmeaFwThresholdForPowCorr) ||
                  (_currentGenesis.Region == "NA" &&
                   _cordonelFirmwarePackage.FwPackageInfo.Version >= PowCorrConst.NaFNaFwThresholdForPowCorr &&
                   _fwUpdatePowerCorrection.ActualFwVersion < PowCorrConst.NaFNaFwThresholdForPowCorr &&
-                  _currentGenesis.InstalledFwVersion >= PowCorrConst.NaFNaFwThresholdForPowCorr))
+                  _currentGenesis.InstalledFwVersion >= PowCorrConst.NaFNaFwThresholdForPowCorr)))
             {
                 // CASE 2.1: Missing power correction settings from FW update package
                 // preset meter power correction file