Index: sources/model/dg/adjustment/settings/MDuetRoWaterDG.cpp
===================================================================
diff -u -ra09c1a91b8eaf9d7164ba7f274d4ccd557c05f22 -r720d1051f9f5fef2d82f3878454550e9e2c5ca92
--- sources/model/dg/adjustment/settings/MDuetRoWaterDG.cpp	(.../MDuetRoWaterDG.cpp)	(revision a09c1a91b8eaf9d7164ba7f274d4ccd557c05f22)
+++ sources/model/dg/adjustment/settings/MDuetRoWaterDG.cpp	(.../MDuetRoWaterDG.cpp)	(revision 720d1051f9f5fef2d82f3878454550e9e2c5ca92)
@@ -54,7 +54,7 @@
 lError:
     if(vIndex) { *vIndex = index; }
     
-return false ;
+    return false ;
 
 }
 
Index: sources/model/dg/data/MDGValvesStatesData.cpp
===================================================================
diff -u -ra09c1a91b8eaf9d7164ba7f274d4ccd557c05f22 -r720d1051f9f5fef2d82f3878454550e9e2c5ca92
--- sources/model/dg/data/MDGValvesStatesData.cpp	(.../MDGValvesStatesData.cpp)	(revision a09c1a91b8eaf9d7164ba7f274d4ccd557c05f22)
+++ sources/model/dg/data/MDGValvesStatesData.cpp	(.../MDGValvesStatesData.cpp)	(revision 720d1051f9f5fef2d82f3878454550e9e2c5ca92)
@@ -39,20 +39,20 @@
 
 bool MDGValvesStates::fromByteArray(const QByteArray &vByteArray, int *vIndex) {
     int index = 0; // message data start position
-    if ( ! GetBits (vByteArray, index, _data.mStates, eFlag_Bits_Length))   goto lError;
-    if ( ! GetValue(vByteArray, index, _data.mVRf      ))                   goto lError;
-    if ( ! GetValue(vByteArray, index, _data.mVRi      ))                   goto lError;
-    if ( ! GetValue(vByteArray, index, _data.mRes      ))                   goto lError;
-    if ( ! GetValue(vByteArray, index, _data.mVRo      ))                   goto lError;
-    if ( ! GetValue(vByteArray, index, _data.mVPo      ))                   goto lError;
-    if ( ! GetValue(vByteArray, index, _data.mVBf      ))                   goto lError;
-    if ( ! GetValue(vByteArray, index, _data.mVRc      ))                   goto lError;
-    if ( ! GetValue(vByteArray, index, _data.mVDr      ))                   goto lError;
-    if ( ! GetValue(vByteArray, index, _data.mVPi      ))                   goto lError;
-    if ( ! GetValue(vByteArray, index, _data.mVSP      ))                   goto lError;
-    if ( ! GetValue(vByteArray, index, _data.mVR1      ))                   goto lError;
-    if ( ! GetValue(vByteArray, index, _data.mVR2      ))                   goto lError;
-    if ( ! GetValue(vByteArray, index, _data.mVPd      ))                   goto lError;
+    if ( ! GetBits (vByteArray, index, _data.mStates, eFlag_Bits_Length )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mVRi                       )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mVRf                       )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mRes                       )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mVRo                       )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mVPo                       )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mVBf                       )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mVRc                       )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mVDr                       )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mVPi                       )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mVSP                       )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mVR1                       )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mVR2                       )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mVPd                       )) goto lError;
 
     return true ;
     
Index: sources/model/hd/adjustment/MAdjustPowerOff.cpp
===================================================================
diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -r720d1051f9f5fef2d82f3878454550e9e2c5ca92
--- sources/model/hd/adjustment/MAdjustPowerOff.cpp	(.../MAdjustPowerOff.cpp)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
+++ sources/model/hd/adjustment/MAdjustPowerOff.cpp	(.../MAdjustPowerOff.cpp)	(revision 720d1051f9f5fef2d82f3878454550e9e2c5ca92)
@@ -24,9 +24,14 @@
 
 bool MPowerOff::fromByteArray(const QByteArray &vByteArray, int *vIndex) {
     int index = 0; // message data start position
-    if (GetValue(vByteArray, index, _data.mStatus    ))
+    if (GetValue(vByteArray, index, _data.mStatus    )) goto lError;
+
     return true ;
-    else { if(vIndex) *vIndex = index; return false; }
+
+lError:
+    if(vIndex) { *vIndex = index; }
+
+    return false ;
 }
 
 /*!
Index: sources/model/hd/alarm/MAlarmCleared.cpp
===================================================================
diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -r720d1051f9f5fef2d82f3878454550e9e2c5ca92
--- sources/model/hd/alarm/MAlarmCleared.cpp	(.../MAlarmCleared.cpp)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
+++ sources/model/hd/alarm/MAlarmCleared.cpp	(.../MAlarmCleared.cpp)	(revision 720d1051f9f5fef2d82f3878454550e9e2c5ca92)
@@ -24,9 +24,14 @@
 
 bool MAlarmCleared::fromByteArray(const QByteArray &vByteArray, int *vIndex) {
     int index = 0; // message data start position
-    if (GetValue(vByteArray, index, _data.mAlarmID))
-        return true ;
-    else { if(vIndex) *vIndex = index; return false; }
+    if (GetValue(vByteArray, index, _data.mAlarmID)) goto lError;
+
+    return true ;
+
+lError:
+    if(vIndex) { *vIndex = index; }
+
+    return false ;
 }
 
 /*!
Index: sources/model/hd/alarm/MAlarmClearedCondition.cpp
===================================================================
diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -r720d1051f9f5fef2d82f3878454550e9e2c5ca92
--- sources/model/hd/alarm/MAlarmClearedCondition.cpp	(.../MAlarmClearedCondition.cpp)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
+++ sources/model/hd/alarm/MAlarmClearedCondition.cpp	(.../MAlarmClearedCondition.cpp)	(revision 720d1051f9f5fef2d82f3878454550e9e2c5ca92)
@@ -25,9 +25,14 @@
 
 bool MAlarmClearedCondition::fromByteArray(const QByteArray &vByteArray, int *vIndex) {
     int index = 0; // message data start position
-    if (GetValue(vByteArray, index, _data.mAlarmID))
-        return true ;
-    else { if(vIndex) *vIndex = index; return false; }
+    if (GetValue(vByteArray, index, _data.mAlarmID)) goto lError;
+
+    return true ;
+
+lError:
+    if(vIndex) { *vIndex = index; }
+
+    return false ;
 }
 
 /*!
Index: sources/model/hd/alarm/MAlarmStatusData.cpp
===================================================================
diff -u -ra09c1a91b8eaf9d7164ba7f274d4ccd557c05f22 -r720d1051f9f5fef2d82f3878454550e9e2c5ca92
--- sources/model/hd/alarm/MAlarmStatusData.cpp	(.../MAlarmStatusData.cpp)	(revision a09c1a91b8eaf9d7164ba7f274d4ccd557c05f22)
+++ sources/model/hd/alarm/MAlarmStatusData.cpp	(.../MAlarmStatusData.cpp)	(revision 720d1051f9f5fef2d82f3878454550e9e2c5ca92)
@@ -29,11 +29,11 @@
 
 bool MAlarmStatus::fromByteArray(const QByteArray &vByteArray, int *vIndex) {
     int index = 0; // message data start position
-    if ( ! GetValue(vByteArray, index, _data.mState       )                                                 )  goto lError;
-    if ( ! GetValue(vByteArray, index, _data.mTop         )                                                 )  goto lError;
-    if ( ! GetValue(vByteArray, index, _data.mEscalatesIn )                                                 )  goto lError;
-    if ( ! GetValue(vByteArray, index, _data.mMuteTimeout )                                                 )  goto lError;
-    if ( ! GetBits (vByteArray, index, _data.mFlags       ,GuiAlarmFlags::NUM_OF_ALARM_STATE_FLAG_BIT_POS)  )  goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mState                                                         )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mTop                                                           )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mEscalatesIn                                                   )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mMuteTimeout                                                   )) goto lError;
+    if ( ! GetBits (vByteArray, index, _data.mFlags       ,GuiAlarmFlags::NUM_OF_ALARM_STATE_FLAG_BIT_POS   )) goto lError;
 
     return true;
 
Index: sources/model/hd/data/post/MHDPostFinalResultData.cpp
===================================================================
diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -r720d1051f9f5fef2d82f3878454550e9e2c5ca92
--- sources/model/hd/data/post/MHDPostFinalResultData.cpp	(.../MHDPostFinalResultData.cpp)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
+++ sources/model/hd/data/post/MHDPostFinalResultData.cpp	(.../MHDPostFinalResultData.cpp)	(revision 720d1051f9f5fef2d82f3878454550e9e2c5ca92)
@@ -25,11 +25,16 @@
 
 bool MHDPostFinalResult::fromByteArray(const QByteArray &vByteArray, int *vIndex) {
     int index = 0; // message data start position
-    if (GetValue(vByteArray, index, _data.mResult ))
-                            return true ;
-    else { if(vIndex) *vIndex = index; return false; }
-}
+    if (GetValue(vByteArray, index, _data.mResult )) goto lError;
 
+    return true ;
+
+lError:
+    if(vIndex) { *vIndex = index; }
+
+    return false ;
+ }
+
 /*!
  * \brief MHDPostFinalResult::data
  * \details Provides the model's data from the received messages data values
Index: sources/model/hd/data/post/MHDRTCEpochData.cpp
===================================================================
diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -r720d1051f9f5fef2d82f3878454550e9e2c5ca92
--- sources/model/hd/data/post/MHDRTCEpochData.cpp	(.../MHDRTCEpochData.cpp)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
+++ sources/model/hd/data/post/MHDRTCEpochData.cpp	(.../MHDRTCEpochData.cpp)	(revision 720d1051f9f5fef2d82f3878454550e9e2c5ca92)
@@ -24,9 +24,14 @@
 
 bool MHDRTCEpochData::fromByteArray(const QByteArray &vByteArray, int *vIndex) {
     int index = 0; // message data start position
-    if (GetValue(vByteArray, index, _data.mEpoch   ))
-        return true ;
-    else { if(vIndex) *vIndex = index; return false; }
+    if (GetValue(vByteArray, index, _data.mEpoch   )) goto lError;
+
+    return true ;
+
+lError:
+    if(vIndex) { *vIndex = index; }
+
+    return false ;
 }
 
 /*!