Index: sources/model/confirm/MDuetConfirmHDi.cpp
===================================================================
diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -ra09c1a91b8eaf9d7164ba7f274d4ccd557c05f22
--- sources/model/confirm/MDuetConfirmHDi.cpp	(.../MDuetConfirmHDi.cpp)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
+++ sources/model/confirm/MDuetConfirmHDi.cpp	(.../MDuetConfirmHDi.cpp)	(revision a09c1a91b8eaf9d7164ba7f274d4ccd557c05f22)
@@ -26,13 +26,16 @@
 
 bool MDuetConfirmHDi::fromByteArray(const QByteArray &vByteArray, int *vIndex) {
     int index = 0; // message data start position
-    if (GetValue(vByteArray, index, _data.mId      ))
-    if (GetValue(vByteArray, index, _data.mCommand ))
-    if (GetValue(vByteArray, index, _data.mReason  ))
-         return true ;
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
+    if ( ! GetValue(vByteArray, index, _data.mId      )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mCommand )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mReason  )) goto lError;
+         
+    return true ;
+
+lError:
+    if(vIndex) { *vIndex = index; }
+
+    return false; 
 }
 
 /*!
Index: sources/model/dg/adjustment/settings/MAdjustDGCleaningUsageResponse.cpp
===================================================================
diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -ra09c1a91b8eaf9d7164ba7f274d4ccd557c05f22
--- sources/model/dg/adjustment/settings/MAdjustDGCleaningUsageResponse.cpp	(.../MAdjustDGCleaningUsageResponse.cpp)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
+++ sources/model/dg/adjustment/settings/MAdjustDGCleaningUsageResponse.cpp	(.../MAdjustDGCleaningUsageResponse.cpp)	(revision a09c1a91b8eaf9d7164ba7f274d4ccd557c05f22)
@@ -33,27 +33,23 @@
 
 bool MAdjustDGCleaningUsageResponse::fromByteArray(const QByteArray &vByteArray, int *vIndex) {
     int index = 0; // message data start position
-    if (GetValue(vByteArray, index, _data.mRoWaterGenTotalL                     ))
-    if (GetValue(vByteArray, index, _data.mRoWaterGenSinceLastServiceL          ))
-    if (GetValue(vByteArray, index, _data.mLastBasicFlushCompleteDateEpoch      ))
-    if (GetValue(vByteArray, index, _data.mLastChemDisStartDateEpoch            ))
-    if (GetValue(vByteArray, index, _data.mLastChemDisCompleteDateEpoch         ))
-    if (GetValue(vByteArray, index, _data.mLastChemDisFlushCompleteDateEpoch    ))
-    if (GetValue(vByteArray, index, _data.mLastHeatDisCompleteDateEpoch         ))
-    if (GetValue(vByteArray, index, _data.mLastHeatActiveCoolCompleteDateEpoch  ))
-    if (GetValue(vByteArray, index, _data.mLastFilterFlushCompleteDateEpoch     ))
-    if (GetValue(vByteArray, index, _data.mLastResetTimeEpoch                   ))
-         return true ;
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
+    if ( ! GetValue(vByteArray, index, _data.mRoWaterGenTotalL                     )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mRoWaterGenSinceLastServiceL          )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mLastBasicFlushCompleteDateEpoch      )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mLastChemDisStartDateEpoch            )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mLastChemDisCompleteDateEpoch         )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mLastChemDisFlushCompleteDateEpoch    )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mLastHeatDisCompleteDateEpoch         )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mLastHeatActiveCoolCompleteDateEpoch  )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mLastFilterFlushCompleteDateEpoch     )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mLastResetTimeEpoch                   )) goto lError;
+    
+    return true ;
+    
+lError:
+    if(vIndex) { *vIndex = index; }
+    
+    return false ;
 }
 
 /*!
Index: sources/model/dg/adjustment/settings/MAdjustDGDateTimeResponse.cpp
===================================================================
diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -ra09c1a91b8eaf9d7164ba7f274d4ccd557c05f22
--- sources/model/dg/adjustment/settings/MAdjustDGDateTimeResponse.cpp	(.../MAdjustDGDateTimeResponse.cpp)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
+++ sources/model/dg/adjustment/settings/MAdjustDGDateTimeResponse.cpp	(.../MAdjustDGDateTimeResponse.cpp)	(revision a09c1a91b8eaf9d7164ba7f274d4ccd557c05f22)
@@ -25,11 +25,15 @@
 
 bool MAdjustDGDateTimeResponse::fromByteArray(const QByteArray &vByteArray, int *vIndex) {
     int index = 0; // message data start position
-    if (GetValue(vByteArray, index, _data.mAccepted ))
-    if (GetValue(vByteArray, index, _data.mReason   ))
-         return true ;
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
+    if ( ! GetValue(vByteArray, index, _data.mAccepted )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mReason   )) goto lError;
+    
+    return true ;
+
+lError:
+    if(vIndex) { *vIndex = index; } 
+    
+    return false ;
 }
 
 /*!
Index: sources/model/dg/adjustment/settings/MAdjustDGServiceDatesResponse.cpp
===================================================================
diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -ra09c1a91b8eaf9d7164ba7f274d4ccd557c05f22
--- sources/model/dg/adjustment/settings/MAdjustDGServiceDatesResponse.cpp	(.../MAdjustDGServiceDatesResponse.cpp)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
+++ sources/model/dg/adjustment/settings/MAdjustDGServiceDatesResponse.cpp	(.../MAdjustDGServiceDatesResponse.cpp)	(revision a09c1a91b8eaf9d7164ba7f274d4ccd557c05f22)
@@ -24,11 +24,15 @@
 
 bool MAdjustServiceDatesDGResponse::fromByteArray(const QByteArray &vByteArray, int *vIndex) {
     int index = 0; // message data start position
-    if (GetValue(vByteArray, index, _data.mLastServiceDateEpoch     ))
-    if (GetValue(vByteArray, index, _data.mServiceIntervalSeconds   ))
-         return true ;
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
+    if ( ! GetValue(vByteArray, index, _data.mLastServiceDateEpoch     )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mServiceIntervalSeconds   )) goto lError;
+    
+    return true ;
+
+lError:
+    if(vIndex) { *vIndex = index; }
+    
+    return false;
 }
 
 /*!
Index: sources/model/dg/adjustment/settings/MAdjustDGVersionsResponse.cpp
===================================================================
diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -ra09c1a91b8eaf9d7164ba7f274d4ccd557c05f22
--- sources/model/dg/adjustment/settings/MAdjustDGVersionsResponse.cpp	(.../MAdjustDGVersionsResponse.cpp)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
+++ sources/model/dg/adjustment/settings/MAdjustDGVersionsResponse.cpp	(.../MAdjustDGVersionsResponse.cpp)	(revision a09c1a91b8eaf9d7164ba7f274d4ccd557c05f22)
@@ -32,25 +32,22 @@
 
 bool MAdjustVersionsDGResponse::fromByteArray(const QByteArray &vByteArray, int *vIndex) {
     int index = 0; // message data start position
-    if (GetValue(vByteArray, index, _data.mMajor                ))
-    if (GetValue(vByteArray, index, _data.mMinor                ))
-    if (GetValue(vByteArray, index, _data.mMicro                ))
-    if (GetValue(vByteArray, index, _data.mBuild                ))
-    if (GetValue(vByteArray, index, _data.mFPGAId               ))
-    if (GetValue(vByteArray, index, _data.mFPGAMajor            ))
-    if (GetValue(vByteArray, index, _data.mFPGAMinor            ))
-    if (GetValue(vByteArray, index, _data.mFPGALab              ))
-    if (GetValue(vByteArray, index, _data.mCompatibilityRev     ))
-         return true ;
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
+    if ( ! GetValue(vByteArray, index, _data.mMajor                )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mMinor                )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mMicro                )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mBuild                )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mFPGAId               )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mFPGAMajor            )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mFPGAMinor            )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mFPGALab              )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mCompatibilityRev     )) goto lError;
+
+    return true ;
+    
+lError:
+    if(vIndex) { *vIndex = index; }
+    
+    return false;
 }
 
 AdjustVersionsDGResponseData MAdjustVersionsDGResponse::data() const {
Index: sources/model/dg/adjustment/settings/MDuetRoWaterDG.cpp
===================================================================
diff -u -r38ae7b93679d05a54fc460dac68891562d7da72d -ra09c1a91b8eaf9d7164ba7f274d4ccd557c05f22
--- sources/model/dg/adjustment/settings/MDuetRoWaterDG.cpp	(.../MDuetRoWaterDG.cpp)	(revision 38ae7b93679d05a54fc460dac68891562d7da72d)
+++ sources/model/dg/adjustment/settings/MDuetRoWaterDG.cpp	(.../MDuetRoWaterDG.cpp)	(revision a09c1a91b8eaf9d7164ba7f274d4ccd557c05f22)
@@ -45,13 +45,17 @@
 
 bool Model::MDuetRoWaterModeDGr::fromByteArray(const QByteArray &vByteArray, int *vIndex) {
     int index = 0; // message data start position
-    if (GetValue(vByteArray, index, _data.mAccepted      ))
-    if (GetValue(vByteArray, index, _data.mReason        ))
-    if (GetValue(vByteArray, index, _data.mFirmwareValue ))
-         return true ;
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
+    if ( ! GetValue(vByteArray, index, _data.mAccepted      )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mReason        )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mFirmwareValue )) goto lError;
+
+    return true ;
+    
+lError:
+    if(vIndex) { *vIndex = index; }
+    
+return false ;
+
 }
 
 /*!
Index: sources/model/dg/data/MDGAccelerometerData.cpp
===================================================================
diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -ra09c1a91b8eaf9d7164ba7f274d4ccd557c05f22
--- sources/model/dg/data/MDGAccelerometerData.cpp	(.../MDGAccelerometerData.cpp)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
+++ sources/model/dg/data/MDGAccelerometerData.cpp	(.../MDGAccelerometerData.cpp)	(revision a09c1a91b8eaf9d7164ba7f274d4ccd557c05f22)
@@ -36,25 +36,22 @@
 
 bool MDGAccelerometer::fromByteArray(const QByteArray &vByteArray, int *vIndex) {
     int index = 0; // message data start position
-    if (GetValue(vByteArray, index, _data.mX     ))
-    if (GetValue(vByteArray, index, _data.mY     ))
-    if (GetValue(vByteArray, index, _data.mZ     ))
-    if (GetValue(vByteArray, index, _data.mXMax  ))
-    if (GetValue(vByteArray, index, _data.mYMax  ))
-    if (GetValue(vByteArray, index, _data.mZMax  ))
-    if (GetValue(vByteArray, index, _data.mXTilt ))
-    if (GetValue(vByteArray, index, _data.mYTilt ))
-    if (GetValue(vByteArray, index, _data.mZTilt ))
-    return true ;
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
+    if ( ! GetValue(vByteArray, index, _data.mX     )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mY     )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mYMax  )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mXMax  )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mZ     )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mZMax  )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mXTilt )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mYTilt )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mZTilt )) goto lError;
+    
+    return true;
+
+lError:
+    if(vIndex) { *vIndex = index; }
+    
+    return false;
 }
 
 MDGAccelerometer::Data MDGAccelerometer::data() const {
Index: sources/model/dg/data/MDGConductivityData.cpp
===================================================================
diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -ra09c1a91b8eaf9d7164ba7f274d4ccd557c05f22
--- sources/model/dg/data/MDGConductivityData.cpp	(.../MDGConductivityData.cpp)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
+++ sources/model/dg/data/MDGConductivityData.cpp	(.../MDGConductivityData.cpp)	(revision a09c1a91b8eaf9d7164ba7f274d4ccd557c05f22)
@@ -36,33 +36,26 @@
 
 bool MDGConductivityData::fromByteArray(const QByteArray &vByteArray, int *vIndex) {
     int index = 0; // message data start position
-    if (GetValue(vByteArray, index, _data.mRORejectionRatio ))
-    if (GetValue(vByteArray, index, _data.mCPi              ))
-    if (GetValue(vByteArray, index, _data.mCPo              ))
-    if (GetValue(vByteArray, index, _data.mCD1              ))
-    if (GetValue(vByteArray, index, _data.mCD2              ))
-    if (GetValue(vByteArray, index, _data.mCPiRaw           ))
-    if (GetValue(vByteArray, index, _data.mCPoRaw           ))
-    if (GetValue(vByteArray, index, _data.mCD1Raw           ))
-    if (GetValue(vByteArray, index, _data.mCD2Raw           ))
-    if (GetValue(vByteArray, index, _data.mCPiSensorStatus  ))
-    if (GetValue(vByteArray, index, _data.mCPoSensorStatus  ))
-    if (GetValue(vByteArray, index, _data.mCD1SensorStatus  ))
-    if (GetValue(vByteArray, index, _data.mCD2SensorStatus  ))
-        return true ;
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
+    if ( ! GetValue(vByteArray, index, _data.mRORejectionRatio )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mCPi              )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mCPo              )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mCD1              )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mCD2              )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mCPiRaw           )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mCPoRaw           )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mCD1Raw           )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mCD2Raw           )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mCPiSensorStatus  )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mCPoSensorStatus  )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mCD1SensorStatus  )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mCD2SensorStatus  )) goto lError;
+    
+    return true ;
+    
+lError:
+    if(vIndex) { *vIndex = index; }
+    
+    return false ; 
 }
 
 /*!
Index: sources/model/dg/data/MDGDrainPumpData.cpp
===================================================================
diff -u -r26433c42f2efa2cb18af95f523581c7eeeff049d -ra09c1a91b8eaf9d7164ba7f274d4ccd557c05f22
--- sources/model/dg/data/MDGDrainPumpData.cpp	(.../MDGDrainPumpData.cpp)	(revision 26433c42f2efa2cb18af95f523581c7eeeff049d)
+++ sources/model/dg/data/MDGDrainPumpData.cpp	(.../MDGDrainPumpData.cpp)	(revision a09c1a91b8eaf9d7164ba7f274d4ccd557c05f22)
@@ -31,23 +31,21 @@
 
 bool MDGDrainPump::fromByteArray(const QByteArray &vByteArray, int *vIndex) {
     int index = 0; // message data start position
-    if (GetValue(vByteArray, index, _data.mRPMI         ))
-    if (GetValue(vByteArray, index, _data.mDAC          ))
-    if (GetValue(vByteArray, index, _data.mState        ))
-    if (GetValue(vByteArray, index, _data.mRPMO         ))
-    if (GetValue(vByteArray, index, _data.mTargetFLPMO  ))
-    if (GetValue(vByteArray, index, _data.mCurrentA     ))
-    if (GetValue(vByteArray, index, _data.mDirection    ))
-    if (GetValue(vByteArray, index, _data.mMaxonRPM     ))
-        return true ;
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
+    if ( ! GetValue(vByteArray, index, _data.mRPMI         )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mDAC          )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mState        )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mRPMO         )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mTargetFLPMO  )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mCurrentA     )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mDirection    )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mMaxonRPM     )) goto lError;
+        
+    return true ;
+    
+lError:
+    if(vIndex) { *vIndex = index; }
+    
+    return false ;
 }
 
 /*!
Index: sources/model/dg/data/MDGHeatersData.cpp
===================================================================
diff -u -r38ae7b93679d05a54fc460dac68891562d7da72d -ra09c1a91b8eaf9d7164ba7f274d4ccd557c05f22
--- sources/model/dg/data/MDGHeatersData.cpp	(.../MDGHeatersData.cpp)	(revision 38ae7b93679d05a54fc460dac68891562d7da72d)
+++ sources/model/dg/data/MDGHeatersData.cpp	(.../MDGHeatersData.cpp)	(revision a09c1a91b8eaf9d7164ba7f274d4ccd557c05f22)
@@ -37,33 +37,26 @@
 
 bool MDGHeaters::fromByteArray(const QByteArray &vByteArray, int *vIndex) {
     int index = 0; // message data start position
-    if (GetValue(vByteArray, index, _data.mMainPrimayHeaterDC       ))
-    if (GetValue(vByteArray, index, _data.mSmallPrimaryHeaterDC     ))
-    if (GetValue(vByteArray, index, _data.mTrimmerHeaterDC          ))
-    if (GetValue(vByteArray, index, _data.mPrimaryTargetTemp        ))
-    if (GetValue(vByteArray, index, _data.mTrimmerTargetTemp        ))
-    if (GetValue(vByteArray, index, _data.mPrimaryHeaterState       ))
-    if (GetValue(vByteArray, index, _data.mTrimmerHeaterState       ))
-    if (GetValue(vByteArray, index, _data.mPrimaryEfficiency        ))
-    if (GetValue(vByteArray, index, _data.mPrimaryCalcTargetTemp    ))
-    if (GetValue(vByteArray, index, _data.mTrimmerCalcCurrentTemp   ))
-    if (GetValue(vByteArray, index, _data.mTrimmerUseLastDC         ))
-    if (GetValue(vByteArray, index, _data.mTrimmerPreviousFlow      ))
-    if (GetValue(vByteArray, index, _data.mTrimmerContolCounter     ))
-                            return true ;
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
+    if ( ! GetValue(vByteArray, index, _data.mMainPrimayHeaterDC       )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mSmallPrimaryHeaterDC     )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mTrimmerHeaterDC          )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mPrimaryTargetTemp        )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mTrimmerTargetTemp        )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mPrimaryHeaterState       )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mTrimmerHeaterState       )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mPrimaryEfficiency        )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mPrimaryCalcTargetTemp    )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mTrimmerCalcCurrentTemp   )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mTrimmerUseLastDC         )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mTrimmerPreviousFlow      )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mTrimmerContolCounter     )) goto lError;
+
+    return true ;
+    
+lError:
+    if(vIndex) { *vIndex = index; }
+    
+    return false ;
 }
 
 /*!
Index: sources/model/dg/data/MDGLoadCellReadingsData.cpp
===================================================================
diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -ra09c1a91b8eaf9d7164ba7f274d4ccd557c05f22
--- sources/model/dg/data/MDGLoadCellReadingsData.cpp	(.../MDGLoadCellReadingsData.cpp)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
+++ sources/model/dg/data/MDGLoadCellReadingsData.cpp	(.../MDGLoadCellReadingsData.cpp)	(revision a09c1a91b8eaf9d7164ba7f274d4ccd557c05f22)
@@ -27,15 +27,17 @@
 
 bool MDGLoadCellReadings::fromByteArray(const QByteArray &vByteArray, int *vIndex) {
     int index = 0; // message data start position
-    if (GetValue(vByteArray, index, _data.mReservoir1Prim ))
-    if (GetValue(vByteArray, index, _data.mReservoir1Bkup ))
-    if (GetValue(vByteArray, index, _data.mReservoir2Prim ))
-    if (GetValue(vByteArray, index, _data.mReservoir2Bkup ))
-                            return true ;
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
+    if ( ! GetValue(vByteArray, index, _data.mReservoir1Prim )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mReservoir1Bkup )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mReservoir2Prim )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mReservoir2Bkup )) goto lError;
+
+    return true ;
+    
+lError:
+    if(vIndex) { *vIndex = index; }
+    
+    return false ;
 }
 
 /*!
Index: sources/model/dg/data/MDGOperationModeData.cpp
===================================================================
diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -ra09c1a91b8eaf9d7164ba7f274d4ccd557c05f22
--- sources/model/dg/data/MDGOperationModeData.cpp	(.../MDGOperationModeData.cpp)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
+++ sources/model/dg/data/MDGOperationModeData.cpp	(.../MDGOperationModeData.cpp)	(revision a09c1a91b8eaf9d7164ba7f274d4ccd557c05f22)
@@ -25,11 +25,15 @@
 
 bool MDGOperationMode::fromByteArray(const QByteArray &vByteArray, int *vIndex) {
     int index = 0; // message data start position
-    if (GetValue(vByteArray, index, _data.mOpMode   ))
-    if (GetValue(vByteArray, index, _data.mSubMode  ))
-                            return true ;
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
+    if ( ! GetValue(vByteArray, index, _data.mOpMode   )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mSubMode  )) goto lError;
+
+    return true ;
+    
+lError:
+    if(vIndex) { *vIndex = index; }
+    
+    return false ;
 }
 
 /*!
Index: sources/model/dg/data/MDGPressuresData.cpp
===================================================================
diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -ra09c1a91b8eaf9d7164ba7f274d4ccd557c05f22
--- sources/model/dg/data/MDGPressuresData.cpp	(.../MDGPressuresData.cpp)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
+++ sources/model/dg/data/MDGPressuresData.cpp	(.../MDGPressuresData.cpp)	(revision a09c1a91b8eaf9d7164ba7f274d4ccd557c05f22)
@@ -28,17 +28,18 @@
 
 bool MDGPressures::fromByteArray(const QByteArray &vByteArray, int *vIndex) {
     int index = 0; // message data start position
-    if (GetValue(vByteArray, index, _data.mROInletPSI       ))
-    if (GetValue(vByteArray, index, _data.mROOutletPSI      ))
-    if (GetValue(vByteArray, index, _data.mDrainInletPSI    ))
-    if (GetValue(vByteArray, index, _data.mDrainOutletPSI   ))
-    if (GetValue(vByteArray, index, _data.mBarometricPSI    ))
-                            return true ;
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
+    if ( ! GetValue(vByteArray, index, _data.mROInletPSI       )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mROOutletPSI      )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mDrainInletPSI    )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mDrainOutletPSI   )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mBarometricPSI    )) goto lError;
+
+    return true ;
+    
+lError:
+    if(vIndex) { *vIndex = index; }
+    
+    return false ;
 }
 
 /*!
Index: sources/model/dg/data/MDGROPumpData.cpp
===================================================================
diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -ra09c1a91b8eaf9d7164ba7f274d4ccd557c05f22
--- sources/model/dg/data/MDGROPumpData.cpp	(.../MDGROPumpData.cpp)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
+++ sources/model/dg/data/MDGROPumpData.cpp	(.../MDGROPumpData.cpp)	(revision a09c1a91b8eaf9d7164ba7f274d4ccd557c05f22)
@@ -29,19 +29,19 @@
 
 bool MDGROPump::fromByteArray(const QByteArray &vByteArray, int *vIndex) {
     int index = 0; // message data start position
-    if (GetValue(vByteArray, index, _data.mPressure     ))
-    if (GetValue(vByteArray, index, _data.mFlowRate     ))
-    if (GetValue(vByteArray, index, _data.mPWM          ))
-    if (GetValue(vByteArray, index, _data.mState        ))
-    if (GetValue(vByteArray, index, _data.mTgtFlowRate  ))
-    if (GetValue(vByteArray, index, _data.mFBPWM        ))
-        return true ;
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
+    if ( ! GetValue(vByteArray, index, _data.mPressure     )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mFlowRate     )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mPWM          )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mState        )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mTgtFlowRate  )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mFBPWM        )) goto lError;
+
+    return true ;
+    
+lError:
+    if(vIndex) { *vIndex = index; }
+    
+    return false ;
 }
 
 /*!
Index: sources/model/dg/data/MDGReservoirData.cpp
===================================================================
diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -ra09c1a91b8eaf9d7164ba7f274d4ccd557c05f22
--- sources/model/dg/data/MDGReservoirData.cpp	(.../MDGReservoirData.cpp)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
+++ sources/model/dg/data/MDGReservoirData.cpp	(.../MDGReservoirData.cpp)	(revision a09c1a91b8eaf9d7164ba7f274d4ccd557c05f22)
@@ -35,31 +35,25 @@
 
 bool MDGReservoir::fromByteArray(const QByteArray &vByteArray, int *vIndex) {
     int index = 0; // message data start position
-    if (GetValue(vByteArray, index, _data.mActiveReservoir              ))
-    if (GetValue(vByteArray, index, _data.mFillToVol                    ))
-    if (GetValue(vByteArray, index, _data.mDrainToVol                   ))
-    if (GetValue(vByteArray, index, _data.mTimeReservoirCycleMS         ))
-    if (GetValue(vByteArray, index, _data.mTimeReservoirFill2SwitchMS   ))
-    if (GetValue(vByteArray, index, _data.mTimeUFDecayMS                ))
-    if (GetValue(vByteArray, index, _data.mTempUFFill                   ))
-    if (GetValue(vByteArray, index, _data.mTempReservoirUseActual       ))
-    if (GetValue(vByteArray, index, _data.mTempReservoirEndFill         ))
-    if (GetValue(vByteArray, index, _data.mTempAvgFill                  ))
-    if (GetValue(vByteArray, index, _data.mTempLastFill                 ))
-    if (GetValue(vByteArray, index, _data.mTimereservoirFill            ))
-                            return true ;
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
+    if ( ! GetValue(vByteArray, index, _data.mActiveReservoir              )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mFillToVol                    )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mDrainToVol                   )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mTimeReservoirCycleMS         )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mTimeReservoirFill2SwitchMS   )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mTimeUFDecayMS                )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mTempUFFill                   )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mTempReservoirUseActual       )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mTempReservoirEndFill         )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mTempAvgFill                  )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mTempLastFill                 )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mTimereservoirFill            )) goto lError;
+
+    return true ;
+    
+lError:
+    if(vIndex) { *vIndex = index; }
+    
+    return false ;
 }
 
 /*!
Index: sources/model/dg/data/MDGTemperaturesData.cpp
===================================================================
diff -u -rf724589acaa51725f5e5f8a746404d01804efbcf -ra09c1a91b8eaf9d7164ba7f274d4ccd557c05f22
--- sources/model/dg/data/MDGTemperaturesData.cpp	(.../MDGTemperaturesData.cpp)	(revision f724589acaa51725f5e5f8a746404d01804efbcf)
+++ sources/model/dg/data/MDGTemperaturesData.cpp	(.../MDGTemperaturesData.cpp)	(revision a09c1a91b8eaf9d7164ba7f274d4ccd557c05f22)
@@ -47,53 +47,36 @@
 
 bool MDGTemperatures::fromByteArray(const QByteArray &vByteArray, int *vIndex) {
     int index = 0; // message data start position
-    if (GetValue(vByteArray, index, _data.mInletPrimaryHeater           ))
-    if (GetValue(vByteArray, index, _data.mHeatDisinfect                ))
-    if (GetValue(vByteArray, index, _data.mOutletPrimaryHeater          ))
-    if (GetValue(vByteArray, index, _data.mConductivitySensor1          ))
-    if (GetValue(vByteArray, index, _data.mConductivitySensor2          ))
-    if (GetValue(vByteArray, index, _data.mOutletRedundancy             ))
-    if (GetValue(vByteArray, index, _data.mInletDialysate               ))
-    if (GetValue(vByteArray, index, _data.mPrimaryHeaterThermoCouple    ))
-    if (GetValue(vByteArray, index, _data.mTrimmerHeaterThermoCouple    ))
-    if (GetValue(vByteArray, index, _data.mPrimaryHeaterColdJunction    ))
-    if (GetValue(vByteArray, index, _data.mTrimmerHeaterColdJunction    ))
-    if (GetValue(vByteArray, index, _data.mPrimaryHeaterInternal        ))
-    if (GetValue(vByteArray, index, _data.mTrimmerHeaterInternal        ))
-    if (GetValue(vByteArray, index, _data.mFpgaBoard                    ))
-    if (GetValue(vByteArray, index, _data.mLoadCellA1B1                 ))
-    if (GetValue(vByteArray, index, _data.mLoadCellA2B2                 ))
-    if (GetValue(vByteArray, index, _data.mInternalTHDORTD              ))
-    if (GetValue(vByteArray, index, _data.mInternalTDIRTD               ))
-    if (GetValue(vByteArray, index, _data.mInteralTHDRTD                ))
-    if (GetValue(vByteArray, index, _data.mInternalCondSnsrTemp         ))
-    if (GetValue(vByteArray, index, _data.mBaroTempSensor               ))
-    if (GetValue(vByteArray, index, _data.mDialysateInletMvngAvg        ))
-    if (GetValue(vByteArray, index, _data.mRedundantOutletMvngAvg       ))
-                            return true ;
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
+    if ( ! GetValue(vByteArray, index, _data.mInletPrimaryHeater           )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mHeatDisinfect                )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mOutletPrimaryHeater          )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mConductivitySensor1          )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mConductivitySensor2          )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mOutletRedundancy             )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mInletDialysate               )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mPrimaryHeaterThermoCouple    )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mTrimmerHeaterThermoCouple    )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mPrimaryHeaterColdJunction    )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mTrimmerHeaterColdJunction    )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mPrimaryHeaterInternal        )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mTrimmerHeaterInternal        )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mFpgaBoard                    )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mLoadCellA1B1                 )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mLoadCellA2B2                 )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mInternalTHDORTD              )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mInternalTDIRTD               )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mInteralTHDRTD                )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mInternalCondSnsrTemp         )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mBaroTempSensor               )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mDialysateInletMvngAvg        )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mRedundantOutletMvngAvg       )) goto lError;
+
+    return true ;
+    
+lError:
+    if(vIndex) { *vIndex = index; }
+    
+    return false ;
 }
 
 /*!
Index: sources/model/dg/data/MDGValvesStatesData.cpp
===================================================================
diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -ra09c1a91b8eaf9d7164ba7f274d4ccd557c05f22
--- sources/model/dg/data/MDGValvesStatesData.cpp	(.../MDGValvesStatesData.cpp)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
+++ sources/model/dg/data/MDGValvesStatesData.cpp	(.../MDGValvesStatesData.cpp)	(revision a09c1a91b8eaf9d7164ba7f274d4ccd557c05f22)
@@ -39,35 +39,27 @@
 
 bool MDGValvesStates::fromByteArray(const QByteArray &vByteArray, int *vIndex) {
     int index = 0; // message data start position
-    if (GetBits (vByteArray, index, _data.mStates, eFlag_Bits_Length))
-    if (GetValue(vByteArray, index, _data.mVRf      ))
-    if (GetValue(vByteArray, index, _data.mVRi      ))
-    if (GetValue(vByteArray, index, _data.mRes      ))
-    if (GetValue(vByteArray, index, _data.mVRo      ))
-    if (GetValue(vByteArray, index, _data.mVPo      ))
-    if (GetValue(vByteArray, index, _data.mVBf      ))
-    if (GetValue(vByteArray, index, _data.mVRc      ))
-    if (GetValue(vByteArray, index, _data.mVDr      ))
-    if (GetValue(vByteArray, index, _data.mVPi      ))
-    if (GetValue(vByteArray, index, _data.mVSP      ))
-    if (GetValue(vByteArray, index, _data.mVR1      ))
-    if (GetValue(vByteArray, index, _data.mVR2      ))
-    if (GetValue(vByteArray, index, _data.mVPd      ))
-        return true;
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
+    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;
+
+    return true ;
+    
+lError:
+    if(vIndex) { *vIndex = index; }
+    
+    return false ;
 }
 
 /*!
Index: sources/model/dg/data/post/MDGPostFinalResultData.cpp
===================================================================
diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -ra09c1a91b8eaf9d7164ba7f274d4ccd557c05f22
--- sources/model/dg/data/post/MDGPostFinalResultData.cpp	(.../MDGPostFinalResultData.cpp)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
+++ sources/model/dg/data/post/MDGPostFinalResultData.cpp	(.../MDGPostFinalResultData.cpp)	(revision a09c1a91b8eaf9d7164ba7f274d4ccd557c05f22)
@@ -25,9 +25,14 @@
 
 bool MDGPostFinalResult::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 ;
 }
 
 /*!
Index: sources/model/dg/data/post/MDGPostSingleResultData.cpp
===================================================================
diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -ra09c1a91b8eaf9d7164ba7f274d4ccd557c05f22
--- sources/model/dg/data/post/MDGPostSingleResultData.cpp	(.../MDGPostSingleResultData.cpp)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
+++ sources/model/dg/data/post/MDGPostSingleResultData.cpp	(.../MDGPostSingleResultData.cpp)	(revision a09c1a91b8eaf9d7164ba7f274d4ccd557c05f22)
@@ -26,11 +26,15 @@
 
 bool MDGPostSingleResult::fromByteArray(const QByteArray &vByteArray, int *vIndex) {
     int index = 0; // message data start position
-    if (GetValue(vByteArray, index, _data.mResult ))
-    if (GetValue(vByteArray, index, _data.mIndex ))
-                            return true ;
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
+    if ( ! GetValue(vByteArray, index, _data.mResult ))  goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mIndex  ))  goto lError;
+    
+    return true ;
+
+lError:
+    if(vIndex) { *vIndex = index; } 
+    
+    return false ;
 }
 
 /*!
Index: sources/model/dg/data/pretreatment/MDGFilterFlushData.cpp
===================================================================
diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -ra09c1a91b8eaf9d7164ba7f274d4ccd557c05f22
--- sources/model/dg/data/pretreatment/MDGFilterFlushData.cpp	(.../MDGFilterFlushData.cpp)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
+++ sources/model/dg/data/pretreatment/MDGFilterFlushData.cpp	(.../MDGFilterFlushData.cpp)	(revision a09c1a91b8eaf9d7164ba7f274d4ccd557c05f22)
@@ -25,11 +25,15 @@
 
 bool MDGFilterFlush::fromByteArray(const QByteArray &vByteArray, int *vIndex) {
     int index = 0; // message data start position
-    if (GetValue(vByteArray, index, _data.mTimeout   ))
-    if (GetValue(vByteArray, index, _data.mCountdown ))
-        return true ;
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
+    if ( ! GetValue(vByteArray, index, _data.mTimeout   )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mCountdown )) goto lError;
+
+    return true ;
+    
+lError:
+    if(vIndex) { *vIndex = index; }
+    
+    return false ;
 }
 
 /*!
Index: sources/model/hd/adjustment/disinfect/MDisinfectAdjustModeResponse.cpp
===================================================================
diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -ra09c1a91b8eaf9d7164ba7f274d4ccd557c05f22
--- sources/model/hd/adjustment/disinfect/MDisinfectAdjustModeResponse.cpp	(.../MDisinfectAdjustModeResponse.cpp)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
+++ sources/model/hd/adjustment/disinfect/MDisinfectAdjustModeResponse.cpp	(.../MDisinfectAdjustModeResponse.cpp)	(revision a09c1a91b8eaf9d7164ba7f274d4ccd557c05f22)
@@ -25,11 +25,15 @@
 
 bool MAdjustDisinfectModeResponse::fromByteArray(const QByteArray &vByteArray, int *vIndex) {
     int index = 0; // message data start position
-    if (GetValue(vByteArray, index, _data.mAccepted ))
-    if (GetValue(vByteArray, index, _data.mReason   ))
-         return true ;
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
+    if ( ! GetValue(vByteArray, index, _data.mAccepted )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mReason   )) goto lError;
+
+    return true ;
+    
+lError:
+    if(vIndex) { *vIndex = index; }
+    
+    return false ;
 }
 
 /*!
Index: sources/model/hd/adjustment/disinfect/MDisinfectAdjustStartResponse.cpp
===================================================================
diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -ra09c1a91b8eaf9d7164ba7f274d4ccd557c05f22
--- sources/model/hd/adjustment/disinfect/MDisinfectAdjustStartResponse.cpp	(.../MDisinfectAdjustStartResponse.cpp)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
+++ sources/model/hd/adjustment/disinfect/MDisinfectAdjustStartResponse.cpp	(.../MDisinfectAdjustStartResponse.cpp)	(revision a09c1a91b8eaf9d7164ba7f274d4ccd557c05f22)
@@ -25,11 +25,15 @@
 
 bool MAdjustDisinfectStartResponse::fromByteArray(const QByteArray &vByteArray, int *vIndex) {
     int index = 0; // message data start position
-    if (GetValue(vByteArray, index, _data.mAccepted ))
-    if (GetValue(vByteArray, index, _data.mReason   ))
-         return true ;
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
+    if ( ! GetValue(vByteArray, index, _data.mAccepted )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mReason   )) goto lError;
+    
+    return true ;
+    
+lError:
+    if(vIndex) { *vIndex = index; }
+    
+    return false ;
 }
 
 /*!
Index: sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustDisposablesRemovalConfirmResponse.cpp
===================================================================
diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -ra09c1a91b8eaf9d7164ba7f274d4ccd557c05f22
--- sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustDisposablesRemovalConfirmResponse.cpp	(.../MPostTreatmentAdjustDisposablesRemovalConfirmResponse.cpp)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
+++ sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustDisposablesRemovalConfirmResponse.cpp	(.../MPostTreatmentAdjustDisposablesRemovalConfirmResponse.cpp)	(revision a09c1a91b8eaf9d7164ba7f274d4ccd557c05f22)
@@ -25,11 +25,15 @@
 
 bool MAdjustDisposablesRemovalConfirmResponse::fromByteArray(const QByteArray &vByteArray, int *vIndex) {
     int index = 0; // message data start position
-    if (GetValue(vByteArray, index, _data.mAccepted ))
-    if (GetValue(vByteArray, index, _data.mReason   ))
-         return true ;
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
+    if ( ! GetValue(vByteArray, index, _data.mAccepted )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mReason   )) goto lError;
+
+    return true ;
+    
+lError:
+    if(vIndex) { *vIndex = index; }
+    
+    return false ;
 }
 
 /*!
Index: sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustPatientDisconnectionConfirmResponse.cpp
===================================================================
diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -ra09c1a91b8eaf9d7164ba7f274d4ccd557c05f22
--- sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustPatientDisconnectionConfirmResponse.cpp	(.../MPostTreatmentAdjustPatientDisconnectionConfirmResponse.cpp)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
+++ sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustPatientDisconnectionConfirmResponse.cpp	(.../MPostTreatmentAdjustPatientDisconnectionConfirmResponse.cpp)	(revision a09c1a91b8eaf9d7164ba7f274d4ccd557c05f22)
@@ -25,11 +25,15 @@
 
 bool MAdjustPatientDisconnectionConfirmResponse::fromByteArray(const QByteArray &vByteArray, int *vIndex) {
     int index = 0; // message data start position
-    if (GetValue(vByteArray, index, _data.mAccepted ))
-    if (GetValue(vByteArray, index, _data.mReason   ))
-         return true ;
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
+    if ( ! GetValue(vByteArray, index, _data.mAccepted )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mReason   )) goto lError;
+
+    return true ;
+    
+lError:
+    if(vIndex) { *vIndex = index; }
+    
+    return false ;
 }
 
 /*!
Index: sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustTreatmentLogResponse.cpp
===================================================================
diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -ra09c1a91b8eaf9d7164ba7f274d4ccd557c05f22
--- sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustTreatmentLogResponse.cpp	(.../MPostTreatmentAdjustTreatmentLogResponse.cpp)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
+++ sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustTreatmentLogResponse.cpp	(.../MPostTreatmentAdjustTreatmentLogResponse.cpp)	(revision a09c1a91b8eaf9d7164ba7f274d4ccd557c05f22)
@@ -63,79 +63,49 @@
     _data.mHeparinConcentration .value  = 1000;
 
     int index = 0; // message data start position
-    if (GetValue(vByteArray, index, _data.mAccepted                     ))
-    if (GetValue(vByteArray, index, _data.mReason                       ))
-    if (GetValue(vByteArray, index, _data.mBloodFlowRate                )) // U32 bloodFlowRate_mL_min;                   ///< Blood flow rate (in mL/min)
-    if (GetValue(vByteArray, index, _data.mDialysateFlowRate            )) // U32 dialysateFlowRate_mL_min;               ///< Dialysate flow rate (in mL/min)
-    if (GetValue(vByteArray, index, _data.mTreatmentDuration            )) // U32 treatmentDuration_sec;                  ///< Selected treatment duration (in sec)
-    if (GetValue(vByteArray, index, _data.mActualTreatmentDuration      )) // U32 actualTreatmentDur_sec;                 ///< Actual treatment duration (in sec)
-    if (GetValue(vByteArray, index, _data.mAcidConcentrateType          )) // U32 acidConcentrate;                        ///< Acid concentrate option
-    if (GetValue(vByteArray, index, _data.mBicarbonateConcentrateType   )) // U32 bicarbConcentrate;                      ///< Bicarbonate concentrate option
-    if (GetValue(vByteArray, index, _data.mPotassiumConcentration       )) // U32 potassiumConcentration;                 ///< Potassium concentration value in mEq/L.
-    if (GetValue(vByteArray, index, _data.mCalciumConcentration         )) // U32 calciumConcentration;                   ///< Calcium concentration value in mEq/L.
-    if (GetValue(vByteArray, index, _data.mBicarbonateConcentration     )) // U32 bicarbonateConcentration;               ///< Bicarbonate concentration value in mEq/L.
-    if (GetValue(vByteArray, index, _data.mSodiumConcentration          )) // U32 sodiumConcentration;                    ///< Sodium concentration value in mEq/L.
-    if (GetValue(vByteArray, index, _data.mDialysateTemperature         )) // F32 dialysateTemperature_degC;              ///< Dialysate temperature (in deg C)
-    if (GetValue(vByteArray, index, _data.mDialyzerType                 )) // U32 dialyzerType;                           ///< Dialyzer type option
-    if (GetValue(vByteArray, index, _data.mTreatmentStartEpoch          )) // U32 treatmentStartDateAndTime;              ///< Treatment start date and time in epoch time (in seconds)
-    if (GetValue(vByteArray, index, _data.mTreatmentEndEpoch            )) // U32 treatmentEndDateAndTime;                ///< Treatment end date and time in epoch time (in seconds)
-    if (GetValue(vByteArray, index, _data.mAverageBloodFlow             )) // F32 avgBloodFlow_mL_min;                    ///< Average blood flow rate during treatment (in mL/min)
-    if (GetValue(vByteArray, index, _data.mAverageDialysateFlow         )) // F32 avgDialysateFlow_mL_min;                ///< Average dialysate flow rate during treatment (in mL/min)
-    if (GetValue(vByteArray, index, _data.mDialysateVolumeUsed          )) // F32 dialysateVolumeUsed_L;                  ///< Dialysate volume used during treatment (in L)
-    if (GetValue(vByteArray, index, _data.mAverageDialysateTemp         )) // F32 avgDialysateTemperature_degC;           ///< Average dialysate temperature (in deg C)
-    if (GetValue(vByteArray, index, _data.mOriginUFVolume               )) // F32 originUFVolume_L;                       ///< Origin ultrafiltration volume (in L)
-    if (GetValue(vByteArray, index, _data.mTargetUFVolume               )) // F32 targetUFVolume_L;                       ///< Target ultrafiltration volume (in L)
-    if (GetValue(vByteArray, index, _data.mActualUFVolume               )) // F32 actualUFVolume_L;                       ///< Actual ultrafiltration volume (in L)
-    if (GetValue(vByteArray, index, _data.mOriginUFRate                 )) // F32 originUFRate_mL_min;                    ///< Origin ultrafiltration rate (in mL/min)
-    if (GetValue(vByteArray, index, _data.mTargetUFRate                 )) // F32 targetUFRate_mL_min;                    ///< Target ultrafiltration rate (in mL/min)
-    if (GetValue(vByteArray, index, _data.mActualUFRate                 )) // F32 actualUFRate_mL_min;                    ///< Actual ultrafiltration rate (in mL/min)
-    if (GetValue(vByteArray, index, _data.mSalineBolusVolume            )) // U32 salineBolusVolume_mL;                   ///< Saline bolus volume (in mL)
-    if (GetValue(vByteArray, index, _data.mHeparinBolusVolume           )) // F32 heparinBolusVolume_mL;                  ///< Heparin bolus volume (in mL)
-    if (GetValue(vByteArray, index, _data.mHeparinDispenseRate          )) // F32 heparinDispenseRate_mL_hr;              ///< Heparin dispense rate (in mL/hr)
-    if (GetValue(vByteArray, index, _data.mHeparinStop                  )) // U32 heparinPreStop_min;                     ///< Heparin pre-stop time (in min)
-    if (GetValue(vByteArray, index, _data.mHeparinDeliveredVolume       )) // F32 heparinDeliveredVolume_mL;              ///< Heparin delivered volume (in mL)
-    if (GetValue(vByteArray, index, _data.mHeparinType                  )) // U32 heparinType;                            ///< Heparin type option
-    if (GetValue(vByteArray, index, _data.mAverageArterialPressure      )) // F32 avgArterialPressure_mmHg;               ///< Average arterial pressure (in mmHg)
-    if (GetValue(vByteArray, index, _data.mAverageVenousPressure        )) // F32 avgVenousPressure_mmHg;                 ///< Average venous pressure (in mmHg)
-    if (GetValue(vByteArray, index, _data.mDeviceID                     )) // U32 deviceID;                               ///< Serial number or UID
-    if (GetValue(vByteArray, index, _data.mWaterSampleTestResult        )) // U32 waterSampleTestResult;                  ///< Pass or fail
-         return true ;
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
+    if ( ! GetValue(vByteArray, index, _data.mAccepted                     )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mReason                       )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mBloodFlowRate                )) goto lError; // U32 bloodFlowRate_mL_min;                   ///< Blood flow rate (in mL/min)
+    if ( ! GetValue(vByteArray, index, _data.mDialysateFlowRate            )) goto lError; // U32 dialysateFlowRate_mL_min;               ///< Dialysate flow rate (in mL/min)
+    if ( ! GetValue(vByteArray, index, _data.mTreatmentDuration            )) goto lError; // U32 treatmentDuration_sec;                  ///< Selected treatment duration (in sec)
+    if ( ! GetValue(vByteArray, index, _data.mActualTreatmentDuration      )) goto lError; // U32 actualTreatmentDur_sec;                 ///< Actual treatment duration (in sec)
+    if ( ! GetValue(vByteArray, index, _data.mAcidConcentrateType          )) goto lError; // U32 acidConcentrate;                        ///< Acid concentrate option
+    if ( ! GetValue(vByteArray, index, _data.mBicarbonateConcentrateType   )) goto lError; // U32 bicarbConcentrate;                      ///< Bicarbonate concentrate option
+    if ( ! GetValue(vByteArray, index, _data.mPotassiumConcentration       )) goto lError; // U32 potassiumConcentration;                 ///< Potassium concentration value in mEq/L.
+    if ( ! GetValue(vByteArray, index, _data.mCalciumConcentration         )) goto lError; // U32 calciumConcentration;                   ///< Calcium concentration value in mEq/L.
+    if ( ! GetValue(vByteArray, index, _data.mBicarbonateConcentration     )) goto lError; // U32 bicarbonateConcentration;               ///< Bicarbonate concentration value in mEq/L.
+    if ( ! GetValue(vByteArray, index, _data.mSodiumConcentration          )) goto lError; // U32 sodiumConcentration;                    ///< Sodium concentration value in mEq/L.
+    if ( ! GetValue(vByteArray, index, _data.mDialysateTemperature         )) goto lError; // F32 dialysateTemperature_degC;              ///< Dialysate temperature (in deg C)
+    if ( ! GetValue(vByteArray, index, _data.mDialyzerType                 )) goto lError; // U32 dialyzerType;                           ///< Dialyzer type option
+    if ( ! GetValue(vByteArray, index, _data.mTreatmentStartEpoch          )) goto lError; // U32 treatmentStartDateAndTime;              ///< Treatment start date and time in epoch time (in seconds)
+    if ( ! GetValue(vByteArray, index, _data.mTreatmentEndEpoch            )) goto lError; // U32 treatmentEndDateAndTime;                ///< Treatment end date and time in epoch time (in seconds)
+    if ( ! GetValue(vByteArray, index, _data.mAverageBloodFlow             )) goto lError; // F32 avgBloodFlow_mL_min;                    ///< Average blood flow rate during treatment (in mL/min)
+    if ( ! GetValue(vByteArray, index, _data.mAverageDialysateFlow         )) goto lError; // F32 avgDialysateFlow_mL_min;                ///< Average dialysate flow rate during treatment (in mL/min)
+    if ( ! GetValue(vByteArray, index, _data.mDialysateVolumeUsed          )) goto lError; // F32 dialysateVolumeUsed_L;                  ///< Dialysate volume used during treatment (in L)
+    if ( ! GetValue(vByteArray, index, _data.mAverageDialysateTemp         )) goto lError; // F32 avgDialysateTemperature_degC;           ///< Average dialysate temperature (in deg C)
+    if ( ! GetValue(vByteArray, index, _data.mOriginUFVolume               )) goto lError; // F32 originUFVolume_L;                       ///< Origin ultrafiltration volume (in L)
+    if ( ! GetValue(vByteArray, index, _data.mTargetUFVolume               )) goto lError; // F32 targetUFVolume_L;                       ///< Target ultrafiltration volume (in L)
+    if ( ! GetValue(vByteArray, index, _data.mActualUFVolume               )) goto lError; // F32 actualUFVolume_L;                       ///< Actual ultrafiltration volume (in L)
+    if ( ! GetValue(vByteArray, index, _data.mOriginUFRate                 )) goto lError; // F32 originUFRate_mL_min;                    ///< Origin ultrafiltration rate (in mL/min)
+    if ( ! GetValue(vByteArray, index, _data.mTargetUFRate                 )) goto lError; // F32 targetUFRate_mL_min;                    ///< Target ultrafiltration rate (in mL/min)
+    if ( ! GetValue(vByteArray, index, _data.mActualUFRate                 )) goto lError; // F32 actualUFRate_mL_min;                    ///< Actual ultrafiltration rate (in mL/min)
+    if ( ! GetValue(vByteArray, index, _data.mSalineBolusVolume            )) goto lError; // U32 salineBolusVolume_mL;                   ///< Saline bolus volume (in mL)
+    if ( ! GetValue(vByteArray, index, _data.mHeparinBolusVolume           )) goto lError; // F32 heparinBolusVolume_mL;                  ///< Heparin bolus volume (in mL)
+    if ( ! GetValue(vByteArray, index, _data.mHeparinDispenseRate          )) goto lError; // F32 heparinDispenseRate_mL_hr;              ///< Heparin dispense rate (in mL/hr)
+    if ( ! GetValue(vByteArray, index, _data.mHeparinStop                  )) goto lError; // U32 heparinPreStop_min;                     ///< Heparin pre-stop time (in min)
+    if ( ! GetValue(vByteArray, index, _data.mHeparinDeliveredVolume       )) goto lError; // F32 heparinDeliveredVolume_mL;              ///< Heparin delivered volume (in mL)
+    if ( ! GetValue(vByteArray, index, _data.mHeparinType                  )) goto lError; // U32 heparinType;                            ///< Heparin type option
+    if ( ! GetValue(vByteArray, index, _data.mAverageArterialPressure      )) goto lError; // F32 avgArterialPressure_mmHg;               ///< Average arterial pressure (in mmHg)
+    if ( ! GetValue(vByteArray, index, _data.mAverageVenousPressure        )) goto lError; // F32 avgVenousPressure_mmHg;                 ///< Average venous pressure (in mmHg)
+    if ( ! GetValue(vByteArray, index, _data.mDeviceID                     )) goto lError; // U32 deviceID;                               ///< Serial number or UID
+    if ( ! GetValue(vByteArray, index, _data.mWaterSampleTestResult        )) goto lError; // U32 waterSampleTestResult;                  ///< Pass or fail
+
+    return true ;
+    
+lError:
+    if(vIndex) { *vIndex = index; }
+    
+    return false ;
 }
 
 /*!
Index: sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustDisposablesConfirmResponse.cpp
===================================================================
diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -ra09c1a91b8eaf9d7164ba7f274d4ccd557c05f22
--- sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustDisposablesConfirmResponse.cpp	(.../MPreTreatmentAdjustDisposablesConfirmResponse.cpp)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
+++ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustDisposablesConfirmResponse.cpp	(.../MPreTreatmentAdjustDisposablesConfirmResponse.cpp)	(revision a09c1a91b8eaf9d7164ba7f274d4ccd557c05f22)
@@ -25,11 +25,15 @@
 
 bool MAdjustDisposablesConfirmResponse::fromByteArray(const QByteArray &vByteArray, int *vIndex) {
     int index = 0; // message data start position
-    if (GetValue(vByteArray, index, _data.mAccepted ))
-    if (GetValue(vByteArray, index, _data.mReason   ))
-         return true ;
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
+    if ( ! GetValue(vByteArray, index, _data.mAccepted )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mReason   )) goto lError;
+
+    return true ;
+    
+lError:
+    if(vIndex) { *vIndex = index; }
+    
+    return false ;
 }
 
 /*!
Index: sources/model/hd/alarm/MAlarmStatusData.cpp
===================================================================
diff -u -r6fa5fe90d8bf6fa25d3ee54d8aba8bcaaa053ee0 -ra09c1a91b8eaf9d7164ba7f274d4ccd557c05f22
--- sources/model/hd/alarm/MAlarmStatusData.cpp	(.../MAlarmStatusData.cpp)	(revision 6fa5fe90d8bf6fa25d3ee54d8aba8bcaaa053ee0)
+++ sources/model/hd/alarm/MAlarmStatusData.cpp	(.../MAlarmStatusData.cpp)	(revision a09c1a91b8eaf9d7164ba7f274d4ccd557c05f22)
@@ -39,7 +39,8 @@
 
 lError:
     if(vIndex) { *vIndex = index; }
-        return false;
+
+    return false;
 }
 
 /*!