Index: sources/model/dg/data/MDGConductivityData.cpp
===================================================================
diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -ra09c1a91b8eaf9d7164ba7f274d4ccd557c05f22
--- sources/model/dg/data/MDGConductivityData.cpp	(.../MDGConductivityData.cpp)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
+++ sources/model/dg/data/MDGConductivityData.cpp	(.../MDGConductivityData.cpp)	(revision a09c1a91b8eaf9d7164ba7f274d4ccd557c05f22)
@@ -36,33 +36,26 @@
 
 bool MDGConductivityData::fromByteArray(const QByteArray &vByteArray, int *vIndex) {
     int index = 0; // message data start position
-    if (GetValue(vByteArray, index, _data.mRORejectionRatio ))
-    if (GetValue(vByteArray, index, _data.mCPi              ))
-    if (GetValue(vByteArray, index, _data.mCPo              ))
-    if (GetValue(vByteArray, index, _data.mCD1              ))
-    if (GetValue(vByteArray, index, _data.mCD2              ))
-    if (GetValue(vByteArray, index, _data.mCPiRaw           ))
-    if (GetValue(vByteArray, index, _data.mCPoRaw           ))
-    if (GetValue(vByteArray, index, _data.mCD1Raw           ))
-    if (GetValue(vByteArray, index, _data.mCD2Raw           ))
-    if (GetValue(vByteArray, index, _data.mCPiSensorStatus  ))
-    if (GetValue(vByteArray, index, _data.mCPoSensorStatus  ))
-    if (GetValue(vByteArray, index, _data.mCD1SensorStatus  ))
-    if (GetValue(vByteArray, index, _data.mCD2SensorStatus  ))
-        return true ;
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
+    if ( ! GetValue(vByteArray, index, _data.mRORejectionRatio )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mCPi              )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mCPo              )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mCD1              )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mCD2              )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mCPiRaw           )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mCPoRaw           )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mCD1Raw           )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mCD2Raw           )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mCPiSensorStatus  )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mCPoSensorStatus  )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mCD1SensorStatus  )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mCD2SensorStatus  )) goto lError;
+    
+    return true ;
+    
+lError:
+    if(vIndex) { *vIndex = index; }
+    
+    return false ; 
 }
 
 /*!