Index: sources/canbus/MessageInterpreter.cpp
===================================================================
diff -u -r38ae7b93679d05a54fc460dac68891562d7da72d -rd75408467177729ebe40cf64fc9f3ba6480dad22
--- sources/canbus/MessageInterpreter.cpp	(.../MessageInterpreter.cpp)	(revision 38ae7b93679d05a54fc460dac68891562d7da72d)
+++ sources/canbus/MessageInterpreter.cpp	(.../MessageInterpreter.cpp)	(revision d75408467177729ebe40cf64fc9f3ba6480dad22)
@@ -448,7 +448,7 @@
     case Gui::GuiActionType::ID_AdjustServiceDatesHDRsp             : ok = notify<Model::MAdjustServiceDatesHDResponse              >(vMessage, vData, Gui::GuiActionType::ID_AdjustServiceDatesHDRsp           ); break;
     case Gui::GuiActionType::ID_AdjustHDDateTimeRsp                 : ok = notify<Model::MAdjustHDDateTimeResponse                  >(vMessage, vData, Gui::GuiActionType::ID_AdjustHDDateTimeRsp               ); break;
     case Gui::GuiActionType::ID_HDUsageInfoRsp                      : ok = notify<Model::MHDUsageInfoResponse                       >(vMessage, vData, Gui::GuiActionType::ID_HDUsageInfoRsp                    ); break;
-    case Gui::GuiActionType::ID_AdjustInstitutionalRecordRsp       : ok = notify<Model::MAdjustInstitutionalRecordResponse         >(vMessage, vData, Gui::GuiActionType::ID_AdjustInstitutionalRecordRsp     ); break;
+    case Gui::GuiActionType::ID_AdjustInstitutionalRecordRsp        : ok = notify<Model::MAdjustInstitutionalRecordResponse         >(vMessage, vData, Gui::GuiActionType::ID_AdjustInstitutionalRecordRsp     ); break;
     // ----- States
     case Gui::GuiActionType::ID_HDOperationModeData                 : ok = notify<Model::MHDOperationMode                           >(vMessage, vData, Gui::GuiActionType::ID_HDOperationModeData               ); break;
     case Gui::GuiActionType::ID_PreTreatmentStates                  : ok = notify<Model::MPreTreatmentStates                        >(vMessage, vData, Gui::GuiActionType::ID_PreTreatmentStates                ); break;
Index: sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustDisposablesPrimeResponse.cpp
===================================================================
diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -rd75408467177729ebe40cf64fc9f3ba6480dad22
--- sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustDisposablesPrimeResponse.cpp	(.../MPreTreatmentAdjustDisposablesPrimeResponse.cpp)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
+++ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustDisposablesPrimeResponse.cpp	(.../MPreTreatmentAdjustDisposablesPrimeResponse.cpp)	(revision d75408467177729ebe40cf64fc9f3ba6480dad22)
@@ -25,11 +25,15 @@
 
 bool MAdjustDisposablesPrimeResponse::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/pretreatment/MPreTreatmentAdjustInitTreatmentResponse.cpp
===================================================================
diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -rd75408467177729ebe40cf64fc9f3ba6480dad22
--- sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustInitTreatmentResponse.cpp	(.../MPreTreatmentAdjustInitTreatmentResponse.cpp)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
+++ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustInitTreatmentResponse.cpp	(.../MPreTreatmentAdjustInitTreatmentResponse.cpp)	(revision d75408467177729ebe40cf64fc9f3ba6480dad22)
@@ -25,12 +25,15 @@
 
 bool MAdjustInitTreatmentResponse::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 ;
 }
 
 MAdjustInitTreatmentResponse::Data MAdjustInitTreatmentResponse::data() const {
Index: sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustParametersValidationResponse.cpp
===================================================================
diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -rd75408467177729ebe40cf64fc9f3ba6480dad22
--- sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustParametersValidationResponse.cpp	(.../MPreTreatmentAdjustParametersValidationResponse.cpp)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
+++ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustParametersValidationResponse.cpp	(.../MPreTreatmentAdjustParametersValidationResponse.cpp)	(revision d75408467177729ebe40cf64fc9f3ba6480dad22)
@@ -41,43 +41,31 @@
 
 bool MAdjustParametersValidationResponse::fromByteArray(const QByteArray &vByteArray, int *vIndex) {
     int index = 0; // message data start position
-    if (GetValue(vByteArray, index, _data.mAccepted                     ))
-    if (GetValue(vByteArray, index, _data.mBloodFlowRate                ))
-    if (GetValue(vByteArray, index, _data.mDialysateFlowRate            ))
-    if (GetValue(vByteArray, index, _data.mDuration                     ))
-    if (GetValue(vByteArray, index, _data.mHeparinStopTime              ))
-    if (GetValue(vByteArray, index, _data.mSalineBolus                  ))
-    if (GetValue(vByteArray, index, _data.mAcidConcentrate              ))
-    if (GetValue(vByteArray, index, _data.mBicarbonateConcentrate       ))
-    if (GetValue(vByteArray, index, _data.mDialyzerType                 ))
-    if (GetValue(vByteArray, index, _data.mHeparinType                  ))
-    if (GetValue(vByteArray, index, _data.mBloodPressureMeasureInterval ))
-    if (GetValue(vByteArray, index, _data.mRinsebackFlowRate            ))
-    if (GetValue(vByteArray, index, _data.mArterialPressureLimitWindow  ))
-    if (GetValue(vByteArray, index, _data.mVenousPressureLimitWindow    ))
-    if (GetValue(vByteArray, index, _data.mVenousPressureLimitAsymtrc   ))
-    if (GetValue(vByteArray, index, _data.mHeparinDispensingRate        ))
-    if (GetValue(vByteArray, index, _data.mHeparinBolusVolume           ))
-    if (GetValue(vByteArray, index, _data.mDialysateTemp                ))
-         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; }
+    if ( ! GetValue(vByteArray, index, _data.mAccepted                     )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mBloodFlowRate                )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mDialysateFlowRate            )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mDuration                     )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mHeparinStopTime              )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mSalineBolus                  )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mAcidConcentrate              )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mBicarbonateConcentrate       )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mDialyzerType                 )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mHeparinType                  )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mBloodPressureMeasureInterval )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mRinsebackFlowRate            )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mArterialPressureLimitWindow  )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mVenousPressureLimitWindow    )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mVenousPressureLimitAsymtrc   )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mHeparinDispensingRate        )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mHeparinBolusVolume           )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mDialysateTemp                )) goto lError;
+
+    return true ;
+    
+lError:
+    if(vIndex) { *vIndex = index; }
+    
+    return false ;
 }
 
 MAdjustParametersValidationResponse::Data MAdjustParametersValidationResponse::data() const {
Index: sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustPatientConnectionBeginResponse.cpp
===================================================================
diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -rd75408467177729ebe40cf64fc9f3ba6480dad22
--- sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustPatientConnectionBeginResponse.cpp	(.../MPreTreatmentAdjustPatientConnectionBeginResponse.cpp)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
+++ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustPatientConnectionBeginResponse.cpp	(.../MPreTreatmentAdjustPatientConnectionBeginResponse.cpp)	(revision d75408467177729ebe40cf64fc9f3ba6480dad22)
@@ -25,11 +25,15 @@
 
 bool MAdjustPatientConnectionBeginResponse::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/pretreatment/MPreTreatmentAdjustPatientConnectionConfirmResponse.cpp
===================================================================
diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -rd75408467177729ebe40cf64fc9f3ba6480dad22
--- sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustPatientConnectionConfirmResponse.cpp	(.../MPreTreatmentAdjustPatientConnectionConfirmResponse.cpp)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
+++ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustPatientConnectionConfirmResponse.cpp	(.../MPreTreatmentAdjustPatientConnectionConfirmResponse.cpp)	(revision d75408467177729ebe40cf64fc9f3ba6480dad22)
@@ -25,11 +25,15 @@
 
 bool MAdjustPatientConnectionConfirmResponse::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/pretreatment/MPreTreatmentAdjustStartTreatmentResponse.cpp
===================================================================
diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -rd75408467177729ebe40cf64fc9f3ba6480dad22
--- sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustStartTreatmentResponse.cpp	(.../MPreTreatmentAdjustStartTreatmentResponse.cpp)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
+++ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustStartTreatmentResponse.cpp	(.../MPreTreatmentAdjustStartTreatmentResponse.cpp)	(revision d75408467177729ebe40cf64fc9f3ba6480dad22)
@@ -25,11 +25,15 @@
 
 bool MAdjustStartTreatmentResponse::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/pretreatment/MPreTreatmentAdjustUltrafiltrationInitResponse.cpp
===================================================================
diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -rd75408467177729ebe40cf64fc9f3ba6480dad22
--- sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustUltrafiltrationInitResponse.cpp	(.../MPreTreatmentAdjustUltrafiltrationInitResponse.cpp)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
+++ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustUltrafiltrationInitResponse.cpp	(.../MPreTreatmentAdjustUltrafiltrationInitResponse.cpp)	(revision d75408467177729ebe40cf64fc9f3ba6480dad22)
@@ -26,13 +26,16 @@
 
 bool MAdjustUltrafiltrationInitResponse::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.mVolume   ))
-         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.mVolume   )) goto lError;
+
+    return true ;
+    
+lError:
+    if(vIndex) { *vIndex = index; }
+    
+    return false ;
 }
 
 /*!
Index: sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustWaterSampleResponse.cpp
===================================================================
diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -rd75408467177729ebe40cf64fc9f3ba6480dad22
--- sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustWaterSampleResponse.cpp	(.../MPreTreatmentAdjustWaterSampleResponse.cpp)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
+++ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustWaterSampleResponse.cpp	(.../MPreTreatmentAdjustWaterSampleResponse.cpp)	(revision d75408467177729ebe40cf64fc9f3ba6480dad22)
@@ -25,11 +25,15 @@
 
 bool MAdjustWaterSampleResponse::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/settings/MAdjustHDAlarmVolumeResponse.cpp
===================================================================
diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -rd75408467177729ebe40cf64fc9f3ba6480dad22
--- sources/model/hd/adjustment/settings/MAdjustHDAlarmVolumeResponse.cpp	(.../MAdjustHDAlarmVolumeResponse.cpp)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
+++ sources/model/hd/adjustment/settings/MAdjustHDAlarmVolumeResponse.cpp	(.../MAdjustHDAlarmVolumeResponse.cpp)	(revision d75408467177729ebe40cf64fc9f3ba6480dad22)
@@ -25,11 +25,15 @@
 
 bool MAdjustHDAlarmVolumeResponse::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/settings/MAdjustHDDateTimeResponse.cpp
===================================================================
diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -rd75408467177729ebe40cf64fc9f3ba6480dad22
--- sources/model/hd/adjustment/settings/MAdjustHDDateTimeResponse.cpp	(.../MAdjustHDDateTimeResponse.cpp)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
+++ sources/model/hd/adjustment/settings/MAdjustHDDateTimeResponse.cpp	(.../MAdjustHDDateTimeResponse.cpp)	(revision d75408467177729ebe40cf64fc9f3ba6480dad22)
@@ -25,11 +25,15 @@
 
 bool MAdjustHDDateTimeResponse::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/settings/MAdjustHDInstitutionalRecordResponse.cpp
===================================================================
diff -u -r31f8f296fb58f57c121a39dfd7e78b11723479c6 -rd75408467177729ebe40cf64fc9f3ba6480dad22
--- sources/model/hd/adjustment/settings/MAdjustHDInstitutionalRecordResponse.cpp	(.../MAdjustHDInstitutionalRecordResponse.cpp)	(revision 31f8f296fb58f57c121a39dfd7e78b11723479c6)
+++ sources/model/hd/adjustment/settings/MAdjustHDInstitutionalRecordResponse.cpp	(.../MAdjustHDInstitutionalRecordResponse.cpp)	(revision d75408467177729ebe40cf64fc9f3ba6480dad22)
@@ -51,61 +51,40 @@
 
 bool MAdjustInstitutionalRecordResponse::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.mMinBloodFlowMLPM               ))
-    if (GetValue(vByteArray, index, _data.mMaxBloodFlowMLPM               ))
-    if (GetValue(vByteArray, index, _data.mMinDialysateFlowMLPM           ))
-    if (GetValue(vByteArray, index, _data.mMaxDialysateFlowMLPM           ))
-    if (GetValue(vByteArray, index, _data.mMinTxDurationMIN               ))
-    if (GetValue(vByteArray, index, _data.mMaxTxDurationMIN               ))
-    if (GetValue(vByteArray, index, _data.mMinStopHepDispBeforeTxEndMIN   ))
-    if (GetValue(vByteArray, index, _data.mMaxStopHepDispBeforeTxEndMIN   ))
-    if (GetValue(vByteArray, index, _data.mMinSalineBolVolumeML           ))
-    if (GetValue(vByteArray, index, _data.mMaxSalineBolVolumeML           ))
-    if (GetValue(vByteArray, index, _data.mMinDialysateTempC              ))
-    if (GetValue(vByteArray, index, _data.mMaxDialysateTempC              ))
-    if (GetValue(vByteArray, index, _data.mMinArtPressLimitWindowMMHG     ))
-    if (GetValue(vByteArray, index, _data.mMaxArtPressLimitWindowMMHG     ))
-    if (GetValue(vByteArray, index, _data.mMinVenPressLimitWindowMMHG     ))
-    if (GetValue(vByteArray, index, _data.mMaxVenPressLimitWindowMMHG     ))
-    if (GetValue(vByteArray, index, _data.mMinVenAsymPressLimitMMHG       ))
-    if (GetValue(vByteArray, index, _data.mMaxVenAsymPressLimitMMHG       ))
-    if (GetValue(vByteArray, index, _data.mMinUltrafiltrationVolumeL      ))
-    if (GetValue(vByteArray, index, _data.mMaxUltrafiltrationVolumeL      ))
-    if (GetValue(vByteArray, index, _data.mMinHepDispRateMLPHR            ))
-    if (GetValue(vByteArray, index, _data.mMaxHepDispRateMLPHR            ))
-    if (GetValue(vByteArray, index, _data.mMinHepBolVolumeML              ))
-    if (GetValue(vByteArray, index, _data.mMaxHepBolVolumeML              ))
-    if (GetValue(vByteArray, index, _data.mEnableChemicalDisinfect        ))
-            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; }
+    if ( ! GetValue(vByteArray, index, _data.mAccepted                       )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mReason                         )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mMinBloodFlowMLPM               )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mMaxBloodFlowMLPM               )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mMinDialysateFlowMLPM           )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mMaxDialysateFlowMLPM           )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mMinTxDurationMIN               )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mMaxTxDurationMIN               )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mMinStopHepDispBeforeTxEndMIN   )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mMaxStopHepDispBeforeTxEndMIN   )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mMinSalineBolVolumeML           )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mMaxSalineBolVolumeML           )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mMinDialysateTempC              )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mMaxDialysateTempC              )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mMinArtPressLimitWindowMMHG     )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mMaxArtPressLimitWindowMMHG     )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mMinVenPressLimitWindowMMHG     )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mMaxVenPressLimitWindowMMHG     )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mMinVenAsymPressLimitMMHG       )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mMaxVenAsymPressLimitMMHG       )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mMinUltrafiltrationVolumeL      )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mMaxUltrafiltrationVolumeL      )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mMinHepDispRateMLPHR            )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mMaxHepDispRateMLPHR            )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mMinHepBolVolumeML              )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mMaxHepBolVolumeML              )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mEnableChemicalDisinfect        )) goto lError;
+
+    return true ;
+    
+lError:
+    if(vIndex) { *vIndex = index; }
+    
+    return false ;
 }
 
 /*!
Index: sources/model/hd/adjustment/settings/MAdjustHDServiceDatesResponse.cpp
===================================================================
diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -rd75408467177729ebe40cf64fc9f3ba6480dad22
--- sources/model/hd/adjustment/settings/MAdjustHDServiceDatesResponse.cpp	(.../MAdjustHDServiceDatesResponse.cpp)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
+++ sources/model/hd/adjustment/settings/MAdjustHDServiceDatesResponse.cpp	(.../MAdjustHDServiceDatesResponse.cpp)	(revision d75408467177729ebe40cf64fc9f3ba6480dad22)
@@ -25,11 +25,15 @@
 
 bool MAdjustServiceDatesHDResponse::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/hd/adjustment/settings/MAdjustHDServiceModeResponse.cpp
===================================================================
diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -rd75408467177729ebe40cf64fc9f3ba6480dad22
--- sources/model/hd/adjustment/settings/MAdjustHDServiceModeResponse.cpp	(.../MAdjustHDServiceModeResponse.cpp)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
+++ sources/model/hd/adjustment/settings/MAdjustHDServiceModeResponse.cpp	(.../MAdjustHDServiceModeResponse.cpp)	(revision d75408467177729ebe40cf64fc9f3ba6480dad22)
@@ -25,11 +25,15 @@
 
 bool MAdjustServiceModeResponse::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/settings/MAdjustHDVersionsResponse.cpp
===================================================================
diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -rd75408467177729ebe40cf64fc9f3ba6480dad22
--- sources/model/hd/adjustment/settings/MAdjustHDVersionsResponse.cpp	(.../MAdjustHDVersionsResponse.cpp)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
+++ sources/model/hd/adjustment/settings/MAdjustHDVersionsResponse.cpp	(.../MAdjustHDVersionsResponse.cpp)	(revision d75408467177729ebe40cf64fc9f3ba6480dad22)
@@ -32,25 +32,22 @@
 
 bool MAdjustVersionsHDResponse::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 ;
 }
 
 AdjustVersionsHDResponseData MAdjustVersionsHDResponse::data() const {
Index: sources/model/hd/adjustment/treatment/MTreatmentAdjustBloodDialysateResponse.cpp
===================================================================
diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -rd75408467177729ebe40cf64fc9f3ba6480dad22
--- sources/model/hd/adjustment/treatment/MTreatmentAdjustBloodDialysateResponse.cpp	(.../MTreatmentAdjustBloodDialysateResponse.cpp)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
+++ sources/model/hd/adjustment/treatment/MTreatmentAdjustBloodDialysateResponse.cpp	(.../MTreatmentAdjustBloodDialysateResponse.cpp)	(revision d75408467177729ebe40cf64fc9f3ba6480dad22)
@@ -27,15 +27,17 @@
 
 bool MAdjustBloodDialysateResponse::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.mBloodRate       ))
-    if (GetValue(vByteArray, index, _data.mDialysateRate   ))
-         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.mAccepted        )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mReason          )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mBloodRate       )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mDialysateRate   )) goto lError;
+
+    return true ;
+    
+lError:
+    if(vIndex) { *vIndex = index; }
+    
+    return false ;
 }
 
 /*!
Index: sources/model/hd/adjustment/treatment/MTreatmentAdjustDurationResponse.cpp
===================================================================
diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -rd75408467177729ebe40cf64fc9f3ba6480dad22
--- sources/model/hd/adjustment/treatment/MTreatmentAdjustDurationResponse.cpp	(.../MTreatmentAdjustDurationResponse.cpp)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
+++ sources/model/hd/adjustment/treatment/MTreatmentAdjustDurationResponse.cpp	(.../MTreatmentAdjustDurationResponse.cpp)	(revision d75408467177729ebe40cf64fc9f3ba6480dad22)
@@ -27,15 +27,17 @@
 
 bool MAdjustDurationResponse::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.mDuration ))
-    if (GetValue(vByteArray, index, _data.mUFVolume ))
-         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.mAccepted )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mReason   )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mDuration )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mUFVolume )) goto lError;
+
+    return true ;
+    
+lError:
+    if(vIndex) { *vIndex = index; }
+    
+    return false ;
 }
 
 /*!
Index: sources/model/hd/adjustment/treatment/MTreatmentAdjustEndResponse.cpp
===================================================================
diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -rd75408467177729ebe40cf64fc9f3ba6480dad22
--- sources/model/hd/adjustment/treatment/MTreatmentAdjustEndResponse.cpp	(.../MTreatmentAdjustEndResponse.cpp)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
+++ sources/model/hd/adjustment/treatment/MTreatmentAdjustEndResponse.cpp	(.../MTreatmentAdjustEndResponse.cpp)	(revision d75408467177729ebe40cf64fc9f3ba6480dad22)
@@ -25,11 +25,15 @@
 
 bool MAdjustTreatmentEndResponse::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/treatment/MTreatmentAdjustHeparinResponse.cpp
===================================================================
diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -rd75408467177729ebe40cf64fc9f3ba6480dad22
--- sources/model/hd/adjustment/treatment/MTreatmentAdjustHeparinResponse.cpp	(.../MTreatmentAdjustHeparinResponse.cpp)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
+++ sources/model/hd/adjustment/treatment/MTreatmentAdjustHeparinResponse.cpp	(.../MTreatmentAdjustHeparinResponse.cpp)	(revision d75408467177729ebe40cf64fc9f3ba6480dad22)
@@ -25,11 +25,15 @@
 
 bool MAdjustHeparinResponse::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/treatment/MTreatmentAdjustPressuresLimitsResponse.cpp
===================================================================
diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -rd75408467177729ebe40cf64fc9f3ba6480dad22
--- sources/model/hd/adjustment/treatment/MTreatmentAdjustPressuresLimitsResponse.cpp	(.../MTreatmentAdjustPressuresLimitsResponse.cpp)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
+++ sources/model/hd/adjustment/treatment/MTreatmentAdjustPressuresLimitsResponse.cpp	(.../MTreatmentAdjustPressuresLimitsResponse.cpp)	(revision d75408467177729ebe40cf64fc9f3ba6480dad22)
@@ -28,17 +28,18 @@
 
 bool MAdjustPressuresLimitsResponse::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.mArterialPressureLimitWindow  ))
-    if (GetValue(vByteArray, index, _data.mVenousPressureLimitWindow    ))
-    if (GetValue(vByteArray, index, _data.mVenousPressureLimitAsymtrc   ))
-         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.mAccepted                     )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mReason                       )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mArterialPressureLimitWindow  )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mVenousPressureLimitWindow    )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mVenousPressureLimitAsymtrc   )) goto lError;
+
+    return true ;
+    
+lError:
+    if(vIndex) { *vIndex = index; }
+    
+    return false ;
 }
 
 /*!
Index: sources/model/hd/adjustment/treatment/MTreatmentAdjustRecirculateResponse.cpp
===================================================================
diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -rd75408467177729ebe40cf64fc9f3ba6480dad22
--- sources/model/hd/adjustment/treatment/MTreatmentAdjustRecirculateResponse.cpp	(.../MTreatmentAdjustRecirculateResponse.cpp)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
+++ sources/model/hd/adjustment/treatment/MTreatmentAdjustRecirculateResponse.cpp	(.../MTreatmentAdjustRecirculateResponse.cpp)	(revision d75408467177729ebe40cf64fc9f3ba6480dad22)
@@ -25,11 +25,15 @@
 
 bool MAdjustRecirculateResponse::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/treatment/MTreatmentAdjustRinsebackResponse.cpp
===================================================================
diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -rd75408467177729ebe40cf64fc9f3ba6480dad22
--- sources/model/hd/adjustment/treatment/MTreatmentAdjustRinsebackResponse.cpp	(.../MTreatmentAdjustRinsebackResponse.cpp)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
+++ sources/model/hd/adjustment/treatment/MTreatmentAdjustRinsebackResponse.cpp	(.../MTreatmentAdjustRinsebackResponse.cpp)	(revision d75408467177729ebe40cf64fc9f3ba6480dad22)
@@ -25,11 +25,15 @@
 
 bool MAdjustRinsebackResponse::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/treatment/MTreatmentAdjustSalineResponse.cpp
===================================================================
diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -rd75408467177729ebe40cf64fc9f3ba6480dad22
--- sources/model/hd/adjustment/treatment/MTreatmentAdjustSalineResponse.cpp	(.../MTreatmentAdjustSalineResponse.cpp)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
+++ sources/model/hd/adjustment/treatment/MTreatmentAdjustSalineResponse.cpp	(.../MTreatmentAdjustSalineResponse.cpp)	(revision d75408467177729ebe40cf64fc9f3ba6480dad22)
@@ -26,13 +26,16 @@
 
 bool MAdjustSalineResponse::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.mTarget   ))
-         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.mTarget   )) goto lError;
+
+    return true ;
+    
+lError:
+    if(vIndex) { *vIndex = index; }
+    
+    return false ;
 }
 
 /*!
Index: sources/model/hd/adjustment/treatment/MTreatmentAdjustUltrafiltrationConfirmResponse.cpp
===================================================================
diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -rd75408467177729ebe40cf64fc9f3ba6480dad22
--- sources/model/hd/adjustment/treatment/MTreatmentAdjustUltrafiltrationConfirmResponse.cpp	(.../MTreatmentAdjustUltrafiltrationConfirmResponse.cpp)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
+++ sources/model/hd/adjustment/treatment/MTreatmentAdjustUltrafiltrationConfirmResponse.cpp	(.../MTreatmentAdjustUltrafiltrationConfirmResponse.cpp)	(revision d75408467177729ebe40cf64fc9f3ba6480dad22)
@@ -36,17 +36,19 @@
 
 bool MAdjustUltrafiltrationConfirmResponse::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.mVolume       ))
-    if (GetValue(vByteArray, index, _data.mDuration     ))
-    if (GetValue(vByteArray, index, _data.mRate         ))
-         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.mAccepted     )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mReason       )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mVolume       )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mDuration     )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mRate         )) goto lError;
+
+    return true ;
+    
+lError:
+    if(vIndex) { *vIndex = index; }
+    
+    return false ;
+
 }
 
 /*!
Index: sources/model/hd/adjustment/treatment/MTreatmentAdjustUltrafiltrationEditResponse.cpp
===================================================================
diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -rd75408467177729ebe40cf64fc9f3ba6480dad22
--- sources/model/hd/adjustment/treatment/MTreatmentAdjustUltrafiltrationEditResponse.cpp	(.../MTreatmentAdjustUltrafiltrationEditResponse.cpp)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
+++ sources/model/hd/adjustment/treatment/MTreatmentAdjustUltrafiltrationEditResponse.cpp	(.../MTreatmentAdjustUltrafiltrationEditResponse.cpp)	(revision d75408467177729ebe40cf64fc9f3ba6480dad22)
@@ -42,23 +42,21 @@
 
 bool MAdjustUltrafiltrationEditResponse::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.mVolume       ))
-    if (GetValue(vByteArray, index, _data.mDuration     ))
-    if (GetValue(vByteArray, index, _data.mDurationDiff ))
-    if (GetValue(vByteArray, index, _data.mRate         ))
-    if (GetValue(vByteArray, index, _data.mRateDiff     ))
-    if (GetValue(vByteArray, index, _data.mRateOld      ))
-         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.mAccepted     )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mReason       )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mVolume       )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mDuration     )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mDurationDiff )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mRate         )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mRateDiff     )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mRateOld      )) goto lError;
+
+    return true ;
+    
+lError:
+    if(vIndex) { *vIndex = index; }
+    
+    return false ;
 }
 
 /*!
Index: sources/model/hd/adjustment/treatment/MTreatmentAdjustUltrafiltrationStateResponse.cpp
===================================================================
diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -rd75408467177729ebe40cf64fc9f3ba6480dad22
--- sources/model/hd/adjustment/treatment/MTreatmentAdjustUltrafiltrationStateResponse.cpp	(.../MTreatmentAdjustUltrafiltrationStateResponse.cpp)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
+++ sources/model/hd/adjustment/treatment/MTreatmentAdjustUltrafiltrationStateResponse.cpp	(.../MTreatmentAdjustUltrafiltrationStateResponse.cpp)	(revision d75408467177729ebe40cf64fc9f3ba6480dad22)
@@ -26,13 +26,16 @@
 
 bool MAdjustUltrafiltrationStateResponse::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.mUFState  ))
-         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.mUFState  )) goto lError;
+
+    return true ;
+    
+lError:
+    if(vIndex) { *vIndex = index; }
+    
+    return false ;
 }
 
 /*!
Index: sources/model/hd/alarm/MAlarmActiveList.cpp
===================================================================
diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -rd75408467177729ebe40cf64fc9f3ba6480dad22
--- sources/model/hd/alarm/MAlarmActiveList.cpp	(.../MAlarmActiveList.cpp)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
+++ sources/model/hd/alarm/MAlarmActiveList.cpp	(.../MAlarmActiveList.cpp)	(revision d75408467177729ebe40cf64fc9f3ba6480dad22)
@@ -35,31 +35,25 @@
 
 bool MAlarmActiveListResponse::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.mAlarmID0 ))
-    if (GetValue(vByteArray, index, _data.mAlarmID1 ))
-    if (GetValue(vByteArray, index, _data.mAlarmID2 ))
-    if (GetValue(vByteArray, index, _data.mAlarmID3 ))
-    if (GetValue(vByteArray, index, _data.mAlarmID4 ))
-    if (GetValue(vByteArray, index, _data.mAlarmID5 ))
-    if (GetValue(vByteArray, index, _data.mAlarmID6 ))
-    if (GetValue(vByteArray, index, _data.mAlarmID7 ))
-    if (GetValue(vByteArray, index, _data.mAlarmID8 ))
-    if (GetValue(vByteArray, index, _data.mAlarmID9 ))
-         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.mAccepted )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mReason   )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mAlarmID0 )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mAlarmID1 )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mAlarmID2 )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mAlarmID3 )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mAlarmID4 )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mAlarmID5 )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mAlarmID6 )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mAlarmID7 )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mAlarmID8 )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mAlarmID9 )) goto lError;
+
+    return true ;
+    
+lError:
+    if(vIndex) { *vIndex = index; }
+    
+    return false ;
 }
 
 /*!
Index: sources/model/hd/alarm/MAlarmMapping.cpp
===================================================================
diff -u -r8804ab4f63e20cc1d4b6da236ab7cb2e1f229128 -rd75408467177729ebe40cf64fc9f3ba6480dad22
--- sources/model/hd/alarm/MAlarmMapping.cpp	(.../MAlarmMapping.cpp)	(revision 8804ab4f63e20cc1d4b6da236ab7cb2e1f229128)
+++ sources/model/hd/alarm/MAlarmMapping.cpp	(.../MAlarmMapping.cpp)	(revision d75408467177729ebe40cf64fc9f3ba6480dad22)
@@ -7,7 +7,7 @@
  *                                                                                 
  * \file    MAlarmMapping.cpp                                                     
  * \author  (last)      Behrouz NematiPour                                        
- * \date    (last)      01-Jan-2024                                                        
+ * \date    (last)      03-Oct-2024                                                        
  * \author  (original)  Behrouz NematiPour                                        
  * \date    (original)  03-May-2021                                               
  *                                                                                 
Index: sources/model/hd/alarm/MAlarmTriggered.cpp
===================================================================
diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -rd75408467177729ebe40cf64fc9f3ba6480dad22
--- sources/model/hd/alarm/MAlarmTriggered.cpp	(.../MAlarmTriggered.cpp)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
+++ sources/model/hd/alarm/MAlarmTriggered.cpp	(.../MAlarmTriggered.cpp)	(revision d75408467177729ebe40cf64fc9f3ba6480dad22)
@@ -39,13 +39,17 @@
     index = _xata_start; // the message parameters are dynamic and the second set may not be sent
                          // and MAbstractDynamic returns true but since it hasn't have proper type it won't increment the index
                          // so the extra data (xata) needs to have its own start setup correctly.
-    if (GetValue(vByteArray, index, _xata.mPriority ))
-    if (GetValue(vByteArray, index, _xata.mRank     ))
-    if (GetValue(vByteArray, index, _xata.mClearTop ))
-        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, _xata.mPriority )) goto lError;
+    if ( ! GetValue(vByteArray, index, _xata.mRank     )) goto lError;
+    if ( ! GetValue(vByteArray, index, _xata.mClearTop )) goto lError;
+
+    return true ;
+    
+lError:
+    if(vIndex) { *vIndex = index; }
+    
+    return false ;
+
 }
 
 /*!
Index: sources/model/hd/data/MHDAccelerometerData.cpp
===================================================================
diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -rd75408467177729ebe40cf64fc9f3ba6480dad22
--- sources/model/hd/data/MHDAccelerometerData.cpp	(.../MHDAccelerometerData.cpp)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
+++ sources/model/hd/data/MHDAccelerometerData.cpp	(.../MHDAccelerometerData.cpp)	(revision d75408467177729ebe40cf64fc9f3ba6480dad22)
@@ -36,25 +36,22 @@
 
 bool MHDAccelerometer::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 ))
+    if ( ! GetValue(vByteArray, index, _data.mX     )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mY     )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mZ     )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mXMax  )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mYMax  )) 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 ;
-    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; }
+    
+lError:
+    if(vIndex) { *vIndex = index; }
+    
+    return false ;
 }
 
 MHDAccelerometer::Data MHDAccelerometer::data() const {
Index: sources/model/hd/data/MHDAirBubbleData.cpp
===================================================================
diff -u -r26433c42f2efa2cb18af95f523581c7eeeff049d -rd75408467177729ebe40cf64fc9f3ba6480dad22
--- sources/model/hd/data/MHDAirBubbleData.cpp	(.../MHDAirBubbleData.cpp)	(revision 26433c42f2efa2cb18af95f523581c7eeeff049d)
+++ sources/model/hd/data/MHDAirBubbleData.cpp	(.../MHDAirBubbleData.cpp)	(revision d75408467177729ebe40cf64fc9f3ba6480dad22)
@@ -25,11 +25,15 @@
 
 bool MHDAirBubbleData::fromByteArray(const QByteArray &vByteArray, int *vIndex) {
     int index = 0;
-    if (GetValue(vByteArray, index, _data.mVenousAirBubbleStatus        ))
-    if (GetValue(vByteArray, index, _data.mVenousAirBubbleState         ))
+    if ( ! GetValue(vByteArray, index, _data.mVenousAirBubbleStatus        )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mVenousAirBubbleState         )) goto lError;
+
     return true ;
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
+    
+lError:
+    if(vIndex) { *vIndex = index; }
+    
+    return false ;
 }
 
 /*!
Index: sources/model/hd/data/MHDAirTrapData.cpp
===================================================================
diff -u -r26433c42f2efa2cb18af95f523581c7eeeff049d -rd75408467177729ebe40cf64fc9f3ba6480dad22
--- sources/model/hd/data/MHDAirTrapData.cpp	(.../MHDAirTrapData.cpp)	(revision 26433c42f2efa2cb18af95f523581c7eeeff049d)
+++ sources/model/hd/data/MHDAirTrapData.cpp	(.../MHDAirTrapData.cpp)	(revision d75408467177729ebe40cf64fc9f3ba6480dad22)
@@ -27,15 +27,17 @@
 
 bool MHDAirTrapData::fromByteArray(const QByteArray &vByteArray, int *vIndex) {
     int index = 0;
-    if (GetValue(vByteArray, index, _data.mAirTrapLowerLevel              ))
-    if (GetValue(vByteArray, index, _data.mAirTrapUpperLevel              ))
-    if (GetValue(vByteArray, index, _data.mAirTrapRawLowerLevel           ))
-    if (GetValue(vByteArray, index, _data.mAirTrapRawUpperLevel           ))
+    if ( ! GetValue(vByteArray, index, _data.mAirTrapLowerLevel              )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mAirTrapUpperLevel              )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mAirTrapRawLowerLevel           )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mAirTrapRawUpperLevel           )) goto lError;
+
     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; }
+    
+lError:
+    if(vIndex) { *vIndex = index; }
+    
+    return false ;
 }
 
 /*!
Index: sources/model/hd/data/MHDBloodLeakData.cpp
===================================================================
diff -u -r38ae7b93679d05a54fc460dac68891562d7da72d -rd75408467177729ebe40cf64fc9f3ba6480dad22
--- sources/model/hd/data/MHDBloodLeakData.cpp	(.../MHDBloodLeakData.cpp)	(revision 38ae7b93679d05a54fc460dac68891562d7da72d)
+++ sources/model/hd/data/MHDBloodLeakData.cpp	(.../MHDBloodLeakData.cpp)	(revision d75408467177729ebe40cf64fc9f3ba6480dad22)
@@ -27,15 +27,17 @@
 
 bool MHDBloodLeakData::fromByteArray(const QByteArray &vByteArray, int *vIndex) {
     int index = 0; // message data start position
-    if (GetValue(vByteArray, index, _data.mBloodLeakStatus              ))
-    if (GetValue(vByteArray, index, _data.mBloodLeakState               ))
-    if (GetValue(vByteArray, index, _data.mBloodLeakPersistentCounter   ))
-    if (GetValue(vByteArray, index, _data.mBloodLeakSerialCommState     ))
+    if ( ! GetValue(vByteArray, index, _data.mBloodLeakStatus              )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mBloodLeakState               )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mBloodLeakPersistentCounter   )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mBloodLeakSerialCommState     )) goto lError;
+
     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; }
+    
+lError:
+    if(vIndex) { *vIndex = index; }
+    
+    return false ;
 }
 
 /*!
Index: sources/model/hd/data/MHDOperationModeData.cpp
===================================================================
diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -rd75408467177729ebe40cf64fc9f3ba6480dad22
--- sources/model/hd/data/MHDOperationModeData.cpp	(.../MHDOperationModeData.cpp)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
+++ sources/model/hd/data/MHDOperationModeData.cpp	(.../MHDOperationModeData.cpp)	(revision d75408467177729ebe40cf64fc9f3ba6480dad22)
@@ -25,11 +25,15 @@
 
 bool MHDOperationMode::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/hd/data/MHDSyringePumpData.cpp
===================================================================
diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -rd75408467177729ebe40cf64fc9f3ba6480dad22
--- sources/model/hd/data/MHDSyringePumpData.cpp	(.../MHDSyringePumpData.cpp)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
+++ sources/model/hd/data/MHDSyringePumpData.cpp	(.../MHDSyringePumpData.cpp)	(revision d75408467177729ebe40cf64fc9f3ba6480dad22)
@@ -34,29 +34,24 @@
 
 bool MHDSyringePump::fromByteArray(const QByteArray &vByteArray, int *vIndex) {
     int index = 0; // message data start position
-    if (GetValue(vByteArray, index, _data.mSyringePumpState     ))
-    if (GetValue(vByteArray, index, _data.mHeparinState         ))
-    if (GetValue(vByteArray, index, _data.mSetRate              ))
-    if (GetValue(vByteArray, index, _data.mMeasuredRate         ))
-    if (GetValue(vByteArray, index, _data.mSyringePumpPosition  ))
-    if (GetValue(vByteArray, index, _data.mVolumeDelivered      ))
-    if (GetValue(vByteArray, index, _data.mMeasuredHome         ))
-    if (GetValue(vByteArray, index, _data.mMeasuredSwitch       ))
-    if (GetValue(vByteArray, index, _data.mMeasuredForce        ))
-    if (GetValue(vByteArray, index, _data.mSafetyVol            ))
-    if (GetValue(vByteArray, index, _data.mStatus               ))
+    if ( ! GetValue(vByteArray, index, _data.mSyringePumpState     )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mHeparinState         )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mSetRate              )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mMeasuredRate         )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mSyringePumpPosition  )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mVolumeDelivered      )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mMeasuredHome         )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mMeasuredSwitch       )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mMeasuredForce        )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mSafetyVol            )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mStatus               )) goto lError;
+
     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; }
+    
+lError:
+    if(vIndex) { *vIndex = index; }
+    
+    return false ;
 }
 
 MHDSyringePump::Data MHDSyringePump::data() const {
Index: sources/model/hd/data/MHDUsageInfoResponse.cpp
===================================================================
diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -rd75408467177729ebe40cf64fc9f3ba6480dad22
--- sources/model/hd/data/MHDUsageInfoResponse.cpp	(.../MHDUsageInfoResponse.cpp)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
+++ sources/model/hd/data/MHDUsageInfoResponse.cpp	(.../MHDUsageInfoResponse.cpp)	(revision d75408467177729ebe40cf64fc9f3ba6480dad22)
@@ -28,17 +28,18 @@
 
 bool MHDUsageInfoResponse::fromByteArray(const QByteArray &vByteArray, int *vIndex) {
     int index = 0; // message data start position
-    if (GetValue(vByteArray, index, _data.mTotalTxHours                 ))
-    if (GetValue(vByteArray, index, _data.mTotalTxHoursSinceLastService ))
-    if (GetValue(vByteArray, index, _data.mEpochOfStartOfLastTx         ))
-    if (GetValue(vByteArray, index, _data.mEpochOfLastRecordReset       ))
-    if (GetValue(vByteArray, index, _data.mCrc                          ))
-        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.mTotalTxHours                  )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mTotalTxHoursSinceLastService  )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mEpochOfStartOfLastTx          )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mEpochOfLastRecordReset        )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mCrc                           )) goto lError;
+
+    return true ;
+    
+lError:
+    if(vIndex) { *vIndex = index; }
+    
+    return false ;
 }
 
 /*!
Index: sources/model/hd/data/MTreatmentRangesData.cpp
===================================================================
diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -rd75408467177729ebe40cf64fc9f3ba6480dad22
--- sources/model/hd/data/MTreatmentRangesData.cpp	(.../MTreatmentRangesData.cpp)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
+++ sources/model/hd/data/MTreatmentRangesData.cpp	(.../MTreatmentRangesData.cpp)	(revision d75408467177729ebe40cf64fc9f3ba6480dad22)
@@ -29,19 +29,19 @@
 
 bool MTreatmentRanges::fromByteArray(const QByteArray &vByteArray, int *vIndex) {
     int index = 0; // message data start position
-    if (GetValue(vByteArray, index, _data.mDuration_Min              ))
-    if (GetValue(vByteArray, index, _data.mDuration_Max              ))
-    if (GetValue(vByteArray, index, _data.mUltrafiltration_Volume_Min))
-    if (GetValue(vByteArray, index, _data.mUltrafiltration_Volume_Max))
-    if (GetValue(vByteArray, index, _data.mDialysate_Flow_Min        ))
-    if (GetValue(vByteArray, index, _data.mDialysate_Flow_Max        ))
-        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.mDuration_Min              )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mDuration_Max              )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mUltrafiltration_Volume_Min)) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mUltrafiltration_Volume_Max)) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mDialysate_Flow_Min        )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mDialysate_Flow_Max        )) goto lError;
+
+    return true ;
+    
+lError:
+    if(vIndex) { *vIndex = index; }
+    
+    return false ;
 }
 
 /*!
Index: sources/model/hd/data/post/MHDPostSingleResultData.cpp
===================================================================
diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -rd75408467177729ebe40cf64fc9f3ba6480dad22
--- sources/model/hd/data/post/MHDPostSingleResultData.cpp	(.../MHDPostSingleResultData.cpp)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
+++ sources/model/hd/data/post/MHDPostSingleResultData.cpp	(.../MHDPostSingleResultData.cpp)	(revision d75408467177729ebe40cf64fc9f3ba6480dad22)
@@ -26,11 +26,15 @@
 
 bool MHDPostSingleResult::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/hd/data/posttreatment/MPostTreatmentStatesData.cpp
===================================================================
diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -rd75408467177729ebe40cf64fc9f3ba6480dad22
--- sources/model/hd/data/posttreatment/MPostTreatmentStatesData.cpp	(.../MPostTreatmentStatesData.cpp)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
+++ sources/model/hd/data/posttreatment/MPostTreatmentStatesData.cpp	(.../MPostTreatmentStatesData.cpp)	(revision d75408467177729ebe40cf64fc9f3ba6480dad22)
@@ -25,11 +25,15 @@
 
 bool MPostTreatmentStates::fromByteArray(const QByteArray &vByteArray, int *vIndex) {
     int index = 0; // message data start position
-    if (GetValue(vByteArray, index, _data.mSubMode      ))
-    if (GetValue(vByteArray, index, _data.mDrainState   ))
-        return true ;
-    else { if(vIndex) *vIndex = index; return false;    }
-    else { if(vIndex) *vIndex = index; return false;    }
+    if ( ! GetValue(vByteArray, index, _data.mSubMode      )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mDrainState   )) goto lError;
+
+    return true ;
+    
+lError:
+    if(vIndex) { *vIndex = index; }
+    
+    return false ;
 }
 
 /*!
Index: sources/model/hd/data/pretreatment/MPreTreatmentDisposablesPrimeData.cpp
===================================================================
diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -rd75408467177729ebe40cf64fc9f3ba6480dad22
--- sources/model/hd/data/pretreatment/MPreTreatmentDisposablesPrimeData.cpp	(.../MPreTreatmentDisposablesPrimeData.cpp)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
+++ sources/model/hd/data/pretreatment/MPreTreatmentDisposablesPrimeData.cpp	(.../MPreTreatmentDisposablesPrimeData.cpp)	(revision d75408467177729ebe40cf64fc9f3ba6480dad22)
@@ -25,11 +25,15 @@
 
 bool MPreTreatmentDisposablesPrime::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/data/pretreatment/MPreTreatmentSelfTestDryData.cpp
===================================================================
diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -rd75408467177729ebe40cf64fc9f3ba6480dad22
--- sources/model/hd/data/pretreatment/MPreTreatmentSelfTestDryData.cpp	(.../MPreTreatmentSelfTestDryData.cpp)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
+++ sources/model/hd/data/pretreatment/MPreTreatmentSelfTestDryData.cpp	(.../MPreTreatmentSelfTestDryData.cpp)	(revision d75408467177729ebe40cf64fc9f3ba6480dad22)
@@ -25,11 +25,15 @@
 
 bool MPreTreatmentSelfTestDry::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/data/pretreatment/MPreTreatmentSelfTestNoCartridgeData.cpp
===================================================================
diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -rd75408467177729ebe40cf64fc9f3ba6480dad22
--- sources/model/hd/data/pretreatment/MPreTreatmentSelfTestNoCartridgeData.cpp	(.../MPreTreatmentSelfTestNoCartridgeData.cpp)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
+++ sources/model/hd/data/pretreatment/MPreTreatmentSelfTestNoCartridgeData.cpp	(.../MPreTreatmentSelfTestNoCartridgeData.cpp)	(revision d75408467177729ebe40cf64fc9f3ba6480dad22)
@@ -25,11 +25,15 @@
 
 bool MPreTreatmentSelfTestNoCartridge::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/data/pretreatment/MPreTreatmentStatesData.cpp
===================================================================
diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -rd75408467177729ebe40cf64fc9f3ba6480dad22
--- sources/model/hd/data/pretreatment/MPreTreatmentStatesData.cpp	(.../MPreTreatmentStatesData.cpp)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
+++ sources/model/hd/data/pretreatment/MPreTreatmentStatesData.cpp	(.../MPreTreatmentStatesData.cpp)	(revision d75408467177729ebe40cf64fc9f3ba6480dad22)
@@ -34,29 +34,24 @@
 
 bool MPreTreatmentStates::fromByteArray(const QByteArray &vByteArray, int *vIndex) {
     int index = 0; // message data start position
-    if (GetValue(vByteArray, index, _data.mSubMode                  ))
-    if (GetValue(vByteArray, index, _data.mWaterSampleState         ))
-    if (GetValue(vByteArray, index, _data.mSelfTestConsumablesState ))
-    if (GetValue(vByteArray, index, _data.mSelfTestNoCartridgeState ))
-    if (GetValue(vByteArray, index, _data.mInstallationState        ))
-    if (GetValue(vByteArray, index, _data.mSelfTestDryState         ))
-    if (GetValue(vByteArray, index, _data.mPrimeState               ))
-    if (GetValue(vByteArray, index, _data.mRecirculateState         ))
-    if (GetValue(vByteArray, index, _data.mPatientConnectionState   ))
-    if (GetValue(vByteArray, index, _data.mWetSelfTestsState        ))
-    if (GetValue(vByteArray, index, _data.mPreTreatmentRsrvrState   ))
-        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; }
+    if ( ! GetValue(vByteArray, index, _data.mSubMode                  )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mWaterSampleState         )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mSelfTestConsumablesState )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mSelfTestNoCartridgeState )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mInstallationState        )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mSelfTestDryState         )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mPrimeState               )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mRecirculateState         )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mPatientConnectionState   )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mWetSelfTestsState        )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mPreTreatmentRsrvrState   )) goto lError;
+
+    return true ;
+    
+lError:
+    if(vIndex) { *vIndex = index; }
+    
+    return false ;
 }
 
 /*!
Index: sources/model/hd/data/treatment/MTreatmentBloodFlowData.cpp
===================================================================
diff -u -r38ae7b93679d05a54fc460dac68891562d7da72d -rd75408467177729ebe40cf64fc9f3ba6480dad22
--- sources/model/hd/data/treatment/MTreatmentBloodFlowData.cpp	(.../MTreatmentBloodFlowData.cpp)	(revision 38ae7b93679d05a54fc460dac68891562d7da72d)
+++ sources/model/hd/data/treatment/MTreatmentBloodFlowData.cpp	(.../MTreatmentBloodFlowData.cpp)	(revision d75408467177729ebe40cf64fc9f3ba6480dad22)
@@ -33,27 +33,23 @@
 
 bool MBloodFlow::fromByteArray(const QByteArray &vByteArray, int *vIndex) {
     int index = 0; // message data start position
-    if (GetValue(vByteArray, index, _data.mFlowSetPoint    ))
-    if (GetValue(vByteArray, index, _data.mMeasuredFlow    ))
-    if (GetValue(vByteArray, index, _data.mRotorSpeed      ))
-    if (GetValue(vByteArray, index, _data.mMotorSpeed      ))
-    if (GetValue(vByteArray, index, _data.mMotorCtlSpeed   ))
-    if (GetValue(vByteArray, index, _data.mMotorCtlCurrent ))
-    if (GetValue(vByteArray, index, _data.mPWMDutyCycle    ))
-    if (GetValue(vByteArray, index, _data.mRotorCount      ))
-    if (GetValue(vByteArray, index, _data.mPresFlow        ))
-    if (GetValue(vByteArray, index, _data.mRotorHall       ))
+    if ( ! GetValue(vByteArray, index, _data.mFlowSetPoint    )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mMeasuredFlow    )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mRotorSpeed      )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mMotorSpeed      )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mMotorCtlSpeed   )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mMotorCtlCurrent )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mPWMDutyCycle    )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mRotorCount      )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mPresFlow        )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mRotorHall       )) goto lError;
+
     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; }
+    
+lError:
+    if(vIndex) { *vIndex = index; }
+    
+    return false ;
 }
 
 /*!
Index: sources/model/hd/data/treatment/MTreatmentBloodPrimeData.cpp
===================================================================
diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -rd75408467177729ebe40cf64fc9f3ba6480dad22
--- sources/model/hd/data/treatment/MTreatmentBloodPrimeData.cpp	(.../MTreatmentBloodPrimeData.cpp)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
+++ sources/model/hd/data/treatment/MTreatmentBloodPrimeData.cpp	(.../MTreatmentBloodPrimeData.cpp)	(revision d75408467177729ebe40cf64fc9f3ba6480dad22)
@@ -25,11 +25,15 @@
 
 bool MTreatmentBloodPrime::fromByteArray(const QByteArray &vByteArray, int *vIndex) {
     int index = 0; // message data start position
-    if (GetValue(vByteArray, index, _data.mTarget ))
-    if (GetValue(vByteArray, index, _data.mCurrent))
+    if ( ! GetValue(vByteArray, index, _data.mTarget )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mCurrent)) goto lError;
+
     return true ;
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
+    
+lError:
+    if(vIndex) { *vIndex = index; }
+    
+    return false ;
 }
 
 /*!
Index: sources/model/hd/data/treatment/MTreatmentDialysateFlowData.cpp
===================================================================
diff -u -r38ae7b93679d05a54fc460dac68891562d7da72d -rd75408467177729ebe40cf64fc9f3ba6480dad22
--- sources/model/hd/data/treatment/MTreatmentDialysateFlowData.cpp	(.../MTreatmentDialysateFlowData.cpp)	(revision 38ae7b93679d05a54fc460dac68891562d7da72d)
+++ sources/model/hd/data/treatment/MTreatmentDialysateFlowData.cpp	(.../MTreatmentDialysateFlowData.cpp)	(revision d75408467177729ebe40cf64fc9f3ba6480dad22)
@@ -33,27 +33,23 @@
 
 bool MDialysateFlow::fromByteArray(const QByteArray &vByteArray, int *vIndex) {
     int index = 0; // message data start position
-    if (GetValue(vByteArray, index, _data.mFlowSetPoint    ))
-    if (GetValue(vByteArray, index, _data.mMeasuredFlow    ))
-    if (GetValue(vByteArray, index, _data.mRotorSpeed      ))
-    if (GetValue(vByteArray, index, _data.mMotorSpeed      ))
-    if (GetValue(vByteArray, index, _data.mMotorCtlSpeed   ))
-    if (GetValue(vByteArray, index, _data.mMotorCtlCurrent ))
-    if (GetValue(vByteArray, index, _data.mPWMDutyCycle    ))
-    if (GetValue(vByteArray, index, _data.mRotorCount      ))
-    if (GetValue(vByteArray, index, _data.mPresFlow        ))
-    if (GetValue(vByteArray, index, _data.mRotorHall       ))
+    if ( ! GetValue(vByteArray, index, _data.mFlowSetPoint    )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mMeasuredFlow    )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mRotorSpeed      )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mMotorSpeed      )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mMotorCtlSpeed   )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mMotorCtlCurrent )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mPWMDutyCycle    )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mRotorCount      )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mPresFlow        )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mRotorHall       )) goto lError;
+    
     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; }
+    
+lError:
+    if(vIndex) { *vIndex = index; }
+    
+    return false ;
 }
 
 /*!
Index: sources/model/hd/data/treatment/MTreatmentHeparinData.cpp
===================================================================
diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -rd75408467177729ebe40cf64fc9f3ba6480dad22
--- sources/model/hd/data/treatment/MTreatmentHeparinData.cpp	(.../MTreatmentHeparinData.cpp)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
+++ sources/model/hd/data/treatment/MTreatmentHeparinData.cpp	(.../MTreatmentHeparinData.cpp)	(revision d75408467177729ebe40cf64fc9f3ba6480dad22)
@@ -25,11 +25,15 @@
 
 bool MTreatmentHeparin::fromByteArray(const QByteArray &vByteArray, int *vIndex) {
     int index = 0; // message data start position
-    if (GetValue(vByteArray, index, _data.mCumulative ))
-    if (GetValue(vByteArray, index, _data.mTarget     ))
+    if ( ! GetValue(vByteArray, index, _data.mCumulative )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mTarget     )) goto lError;
+
     return true ;
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
+    
+lError:
+    if(vIndex) { *vIndex = index; }
+    
+    return false ;
 }
 
 /*!
Index: sources/model/hd/data/treatment/MTreatmentOutletFlowData.cpp
===================================================================
diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -rd75408467177729ebe40cf64fc9f3ba6480dad22
--- sources/model/hd/data/treatment/MTreatmentOutletFlowData.cpp	(.../MTreatmentOutletFlowData.cpp)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
+++ sources/model/hd/data/treatment/MTreatmentOutletFlowData.cpp	(.../MTreatmentOutletFlowData.cpp)	(revision d75408467177729ebe40cf64fc9f3ba6480dad22)
@@ -36,33 +36,26 @@
 
 bool MOutletFlow::fromByteArray(const QByteArray &vByteArray, int *vIndex) {
     int index = 0; // message data start position
-    if (GetValue(vByteArray, index, _data.mRefUFVol        ))
-    if (GetValue(vByteArray, index, _data.mMeasUFVol       ))
-    if (GetValue(vByteArray, index, _data.mRotorSpeed      ))
-    if (GetValue(vByteArray, index, _data.mMotorSpeed      ))
-    if (GetValue(vByteArray, index, _data.mMotorCtlSpeed   ))
-    if (GetValue(vByteArray, index, _data.mMotorCtlCurrent ))
-    if (GetValue(vByteArray, index, _data.mPWMDtCycle      ))
-    if (GetValue(vByteArray, index, _data.mDopCorrOffset   ))
-    if (GetValue(vByteArray, index, _data.mDopCalcRate     ))
-    if (GetValue(vByteArray, index, _data.mUfCalcRate      ))
-    if (GetValue(vByteArray, index, _data.mRotorHall       ))
-    if (GetValue(vByteArray, index, _data.mCurrentSetUFRate))
-    if (GetValue(vByteArray, index, _data.mDialOutPumpState))
+    if ( ! GetValue(vByteArray, index, _data.mRefUFVol        )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mMeasUFVol       )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mRotorSpeed      )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mMotorSpeed      )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mMotorCtlSpeed   )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mMotorCtlCurrent )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mPWMDtCycle      )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mDopCorrOffset   )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mDopCalcRate     )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mUfCalcRate      )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mRotorHall       )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mCurrentSetUFRate)) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mDialOutPumpState)) goto lError;
+
     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; }
+    
+lError:
+    if(vIndex) { *vIndex = index; }
+    
+    return false ;
 }
 
 /*!
Index: sources/model/hd/data/treatment/MTreatmentPressureOcclusionData.cpp
===================================================================
diff -u -r38ae7b93679d05a54fc460dac68891562d7da72d -rd75408467177729ebe40cf64fc9f3ba6480dad22
--- sources/model/hd/data/treatment/MTreatmentPressureOcclusionData.cpp	(.../MTreatmentPressureOcclusionData.cpp)	(revision 38ae7b93679d05a54fc460dac68891562d7da72d)
+++ sources/model/hd/data/treatment/MTreatmentPressureOcclusionData.cpp	(.../MTreatmentPressureOcclusionData.cpp)	(revision d75408467177729ebe40cf64fc9f3ba6480dad22)
@@ -35,31 +35,25 @@
 
 bool MPressureOcclusion::fromByteArray(const QByteArray &vByteArray, int *vIndex) {
     int index = 0; // message data start position
-    if (GetValue(vByteArray, index, _data.mArterialPressure     ))
-    if (GetValue(vByteArray, index, _data.mVenousPressure       ))
-    if (GetValue(vByteArray, index, _data.mBloodPumpOcclusion   ))
-    if (GetValue(vByteArray, index, _data.mPressureLimitState   ))
-    if (GetValue(vByteArray, index, _data.mArterialLimitLow     ))
-    if (GetValue(vByteArray, index, _data.mArterialLimitHigh    ))
-    if (GetValue(vByteArray, index, _data.mVenousLimitLow       ))
-    if (GetValue(vByteArray, index, _data.mVenousLimitHigh      ))
-    if (GetValue(vByteArray, index, _data.mArtLongFilter        ))
-    if (GetValue(vByteArray, index, _data.mVenousLongFilter     ))
-    if (GetValue(vByteArray, index, _data.mBloodOcclLongFilter  ))
-    if (GetValue(vByteArray, index, _data.mPartialOcclBaseline  ))
-        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.mArterialPressure     )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mVenousPressure       )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mBloodPumpOcclusion   )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mPressureLimitState   )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mArterialLimitLow     )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mArterialLimitHigh    )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mVenousLimitLow       )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mVenousLimitHigh      )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mArtLongFilter        )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mVenousLongFilter     )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mBloodOcclLongFilter  )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mPartialOcclBaseline  )) goto lError;
+
+    return true ;
+    
+lError:
+    if(vIndex) { *vIndex = index; }
+    
+    return false ;
 }
 
 /*!
Index: sources/model/hd/data/treatment/MTreatmentRecirculateData.cpp
===================================================================
diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -rd75408467177729ebe40cf64fc9f3ba6480dad22
--- sources/model/hd/data/treatment/MTreatmentRecirculateData.cpp	(.../MTreatmentRecirculateData.cpp)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
+++ sources/model/hd/data/treatment/MTreatmentRecirculateData.cpp	(.../MTreatmentRecirculateData.cpp)	(revision d75408467177729ebe40cf64fc9f3ba6480dad22)
@@ -25,11 +25,15 @@
 
 bool MTreatmentRecirculate::fromByteArray(const QByteArray &vByteArray, int *vIndex) {
     int index = 0; // message data start position
-    if (GetValue(vByteArray, index, _data.mTimeoutTotal    ))
-    if (GetValue(vByteArray, index, _data.mTimeoutCountDown))
+    if ( ! GetValue(vByteArray, index, _data.mTimeoutTotal    )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mTimeoutCountDown)) goto lError;
+
     return true ;
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
+    
+lError:
+    if(vIndex) { *vIndex = index; }
+    
+    return false ;
 }
 
 /*!
Index: sources/model/hd/data/treatment/MTreatmentRinsebackData.cpp
===================================================================
diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -rd75408467177729ebe40cf64fc9f3ba6480dad22
--- sources/model/hd/data/treatment/MTreatmentRinsebackData.cpp	(.../MTreatmentRinsebackData.cpp)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
+++ sources/model/hd/data/treatment/MTreatmentRinsebackData.cpp	(.../MTreatmentRinsebackData.cpp)	(revision d75408467177729ebe40cf64fc9f3ba6480dad22)
@@ -29,19 +29,19 @@
 
 bool MTreatmentRinseback::fromByteArray(const QByteArray &vByteArray, int *vIndex) {
     int index = 0; // message data start position
-    if (GetValue(vByteArray, index, _data.mTarget           ))
-    if (GetValue(vByteArray, index, _data.mCurrent          ))
-    if (GetValue(vByteArray, index, _data.mRate             ))
-    if (GetValue(vByteArray, index, _data.mTimeoutTotal     ))
-    if (GetValue(vByteArray, index, _data.mTimeoutCountDown ))
-    if (GetValue(vByteArray, index, _data.mIsCompleted      ))
+    if ( ! GetValue(vByteArray, index, _data.mTarget           )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mCurrent          )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mRate             )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mTimeoutTotal     )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mTimeoutCountDown )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mIsCompleted      )) goto lError;
+
     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; }
+    
+lError:
+    if(vIndex) { *vIndex = index; }
+    
+    return false ;
 }
 
 /*!
Index: sources/model/hd/data/treatment/MTreatmentSalineData.cpp
===================================================================
diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -rd75408467177729ebe40cf64fc9f3ba6480dad22
--- sources/model/hd/data/treatment/MTreatmentSalineData.cpp	(.../MTreatmentSalineData.cpp)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
+++ sources/model/hd/data/treatment/MTreatmentSalineData.cpp	(.../MTreatmentSalineData.cpp)	(revision d75408467177729ebe40cf64fc9f3ba6480dad22)
@@ -26,13 +26,16 @@
 
 bool MTreatmentSaline::fromByteArray(const QByteArray &vByteArray, int *vIndex) {
     int index = 0; // message data start position
-    if (GetValue(vByteArray, index, _data.mTarget     ))
-    if (GetValue(vByteArray, index, _data.mCumulative ))
-    if (GetValue(vByteArray, index, _data.mDelivered  ))
+    if ( ! GetValue(vByteArray, index, _data.mTarget     )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mCumulative )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mDelivered  )) goto lError;
+
     return true ;
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
+    
+lError:
+    if(vIndex) { *vIndex = index; }
+    
+    return false ;
 }
 
 /*!
Index: sources/model/hd/data/treatment/MTreatmentStatesData.cpp
===================================================================
diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -rd75408467177729ebe40cf64fc9f3ba6480dad22
--- sources/model/hd/data/treatment/MTreatmentStatesData.cpp	(.../MTreatmentStatesData.cpp)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
+++ sources/model/hd/data/treatment/MTreatmentStatesData.cpp	(.../MTreatmentStatesData.cpp)	(revision d75408467177729ebe40cf64fc9f3ba6480dad22)
@@ -33,27 +33,23 @@
 
 bool MTreatmentStates::fromByteArray(const QByteArray &vByteArray, int *vIndex) {
     int index = 0; // message data start position
-    if (GetValue(vByteArray, index, _data.mSubMode              ))
-    if (GetValue(vByteArray, index, _data.mUFState              ))
-    if (GetValue(vByteArray, index, _data.mSalineState          ))
-    if (GetValue(vByteArray, index, _data.mHeparinState         ))
-    if (GetValue(vByteArray, index, _data.mRinsebackState       ))
-    if (GetValue(vByteArray, index, _data.mRecirculateState     ))
-    if (GetValue(vByteArray, index, _data.mBloodPrimeState      ))
-    if (GetValue(vByteArray, index, _data.mTreatmentEndState    ))
-    if (GetValue(vByteArray, index, _data.mTreatmentStopState   ))
-    if (GetValue(vByteArray, index, _data.mDialysisState        ))
-        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.mSubMode              )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mUFState              )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mSalineState          )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mHeparinState         )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mRinsebackState       )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mRecirculateState     )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mBloodPrimeState      )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mTreatmentEndState    )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mTreatmentStopState   )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mDialysisState        )) goto lError;
+
+    return true ;
+    
+lError:
+    if(vIndex) { *vIndex = index; }
+    
+    return false ;
 }
 
 /*!
Index: sources/model/hd/data/treatment/MTreatmentStopData.cpp
===================================================================
diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -rd75408467177729ebe40cf64fc9f3ba6480dad22
--- sources/model/hd/data/treatment/MTreatmentStopData.cpp	(.../MTreatmentStopData.cpp)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
+++ sources/model/hd/data/treatment/MTreatmentStopData.cpp	(.../MTreatmentStopData.cpp)	(revision d75408467177729ebe40cf64fc9f3ba6480dad22)
@@ -25,11 +25,15 @@
 
 bool MTreatmentStop::fromByteArray(const QByteArray &vByteArray, int *vIndex) {
     int index = 0; // message data start position
-    if (GetValue(vByteArray, index, _data.mTotal    ))
-    if (GetValue(vByteArray, index, _data.mCountDown))
+    if ( ! GetValue(vByteArray, index, _data.mTotal    )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mCountDown)) goto lError;
+
     return true ;
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
+    
+lError:
+    if(vIndex) { *vIndex = index; }
+    
+    return false ;
 }
 
 /*!
Index: sources/model/hd/data/treatment/MTreatmentTimeData.cpp
===================================================================
diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -rd75408467177729ebe40cf64fc9f3ba6480dad22
--- sources/model/hd/data/treatment/MTreatmentTimeData.cpp	(.../MTreatmentTimeData.cpp)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
+++ sources/model/hd/data/treatment/MTreatmentTimeData.cpp	(.../MTreatmentTimeData.cpp)	(revision d75408467177729ebe40cf64fc9f3ba6480dad22)
@@ -26,13 +26,16 @@
 
 bool MTreatmentTime::fromByteArray(const QByteArray &vByteArray, int *vIndex) {
     int index = 0; // message data start position
-    if (GetValue(vByteArray, index, _data.mTotal     ))
-    if (GetValue(vByteArray, index, _data.mElapsed   ))
-    if (GetValue(vByteArray, index, _data.mRemaining ))
+    if ( ! GetValue(vByteArray, index, _data.mTotal     )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mElapsed   )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mRemaining )) goto lError;
+
     return true ;
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
+    
+lError:
+    if(vIndex) { *vIndex = index; }
+    
+    return false ;
 }
 
 /*!
Index: sources/model/hd/data/treatmentlog/MTreatmentLogAlarmData.cpp
===================================================================
diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -rd75408467177729ebe40cf64fc9f3ba6480dad22
--- sources/model/hd/data/treatmentlog/MTreatmentLogAlarmData.cpp	(.../MTreatmentLogAlarmData.cpp)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
+++ sources/model/hd/data/treatmentlog/MTreatmentLogAlarmData.cpp	(.../MTreatmentLogAlarmData.cpp)	(revision d75408467177729ebe40cf64fc9f3ba6480dad22)
@@ -29,13 +29,16 @@
 
 bool MTreatmentLogAlarmData::fromByteArray(const QByteArray &vByteArray, int *vIndex) {
     int index = 0; // message data start position
-    if (GetValue(vByteArray, index, _data.mAlarmID  ))
-    if (GetValue(vByteArray, index, _data.mParam1   ))
-    if (GetValue(vByteArray, index, _data.mParam2   ))
-        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.mAlarmID  )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mParam1   )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mParam2   )) goto lError;
+
+    return true ;
+    
+lError:
+    if(vIndex) { *vIndex = index; }
+    
+    return false ;
 }
 
 /*!
Index: sources/model/hd/data/treatmentlog/MTreatmentLogAvrgeData.cpp
===================================================================
diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -rd75408467177729ebe40cf64fc9f3ba6480dad22
--- sources/model/hd/data/treatmentlog/MTreatmentLogAvrgeData.cpp	(.../MTreatmentLogAvrgeData.cpp)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
+++ sources/model/hd/data/treatmentlog/MTreatmentLogAvrgeData.cpp	(.../MTreatmentLogAvrgeData.cpp)	(revision d75408467177729ebe40cf64fc9f3ba6480dad22)
@@ -31,17 +31,18 @@
 
 bool MTreatmentLogAvrgeData::fromByteArray(const QByteArray &vByteArray, int *vIndex) {
     int index = 0; // message data start position
-    if (GetValue(vByteArray, index, _data.mBloodFlowRate    ))
-    if (GetValue(vByteArray, index, _data.mDialysateFlowRate))
-    if (GetValue(vByteArray, index, _data.mUFRate           ))
-    if (GetValue(vByteArray, index, _data.mArterialPressure ))
-    if (GetValue(vByteArray, index, _data.mVenousPressure   ))
-        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.mBloodFlowRate    )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mDialysateFlowRate)) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mUFRate           )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mArterialPressure )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mVenousPressure   )) goto lError;
+
+    return true ;
+    
+lError:
+    if(vIndex) { *vIndex = index; }
+    
+    return false ;
 }
 
 /*!
Index: sources/model/hd/data/treatmentlog/MTreatmentLogEventData.cpp
===================================================================
diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -rd75408467177729ebe40cf64fc9f3ba6480dad22
--- sources/model/hd/data/treatmentlog/MTreatmentLogEventData.cpp	(.../MTreatmentLogEventData.cpp)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
+++ sources/model/hd/data/treatmentlog/MTreatmentLogEventData.cpp	(.../MTreatmentLogEventData.cpp)	(revision d75408467177729ebe40cf64fc9f3ba6480dad22)
@@ -29,13 +29,16 @@
 
 bool MTreatmentLogEventData::fromByteArray(const QByteArray &vByteArray, int *vIndex) {
     int index = 0; // message data start position
-    if (GetValue(vByteArray, index, _data.mEventID  ))
-    if (GetValue(vByteArray, index, _data.mOldValue ))
-    if (GetValue(vByteArray, index, _data.mNewValue ))
-        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.mEventID  )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mOldValue )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mNewValue )) goto lError;
+
+    return true ;
+    
+lError:
+    if(vIndex) { *vIndex = index; }
+    
+    return false ;
 }
 
 /*!
Index: sources/model/ui/data/MUIBloodPressureData.cpp
===================================================================
diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -rd75408467177729ebe40cf64fc9f3ba6480dad22
--- sources/model/ui/data/MUIBloodPressureData.cpp	(.../MUIBloodPressureData.cpp)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
+++ sources/model/ui/data/MUIBloodPressureData.cpp	(.../MUIBloodPressureData.cpp)	(revision d75408467177729ebe40cf64fc9f3ba6480dad22)
@@ -51,33 +51,26 @@
 
 bool MUIBloodPressure::fromByteArray(const QByteArray &vByteArray, int *vIndex) {
     int index = 0; // message data start position
-    if (GetValue(vByteArray, index, _data.mFlags       ))
-    if (GetValue(vByteArray, index, _data.mSystolic    ))
-    if (GetValue(vByteArray, index, _data.mDiastolic   ))
-    if (GetValue(vByteArray, index, _data.mMeanArterial))
-    if (GetValue(vByteArray, index, _data.mYear        ))
-    if (GetValue(vByteArray, index, _data.mMonth       ))
-    if (GetValue(vByteArray, index, _data.mDay         ))
-    if (GetValue(vByteArray, index, _data.mHour        ))
-    if (GetValue(vByteArray, index, _data.mMinute      ))
-    if (GetValue(vByteArray, index, _data.mSecond      ))
-    if (GetValue(vByteArray, index, _data.mPulseRate   ))
-    if (GetValue(vByteArray, index, _data.mUserId      ))
-    if (GetValue(vByteArray, index, _data.mStatus      ))
+    if ( ! GetValue(vByteArray, index, _data.mFlags       )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mSystolic    )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mDiastolic   )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mMeanArterial)) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mYear        )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mMonth       )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mDay         )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mHour        )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mMinute      )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mSecond      )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mPulseRate   )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mUserId      )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mStatus      )) goto lError;
+
     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; }
+    
+lError:
+    if(vIndex) { *vIndex = index; }
+    
+    return false ;
 }
 
 MUIBloodPressure::Data MUIBloodPressure::data() const {