Index: sources/model/dg/data/MDGDrainPumpData.cpp
===================================================================
diff -u -r26433c42f2efa2cb18af95f523581c7eeeff049d -ra09c1a91b8eaf9d7164ba7f274d4ccd557c05f22
--- sources/model/dg/data/MDGDrainPumpData.cpp	(.../MDGDrainPumpData.cpp)	(revision 26433c42f2efa2cb18af95f523581c7eeeff049d)
+++ sources/model/dg/data/MDGDrainPumpData.cpp	(.../MDGDrainPumpData.cpp)	(revision a09c1a91b8eaf9d7164ba7f274d4ccd557c05f22)
@@ -31,23 +31,21 @@
 
 bool MDGDrainPump::fromByteArray(const QByteArray &vByteArray, int *vIndex) {
     int index = 0; // message data start position
-    if (GetValue(vByteArray, index, _data.mRPMI         ))
-    if (GetValue(vByteArray, index, _data.mDAC          ))
-    if (GetValue(vByteArray, index, _data.mState        ))
-    if (GetValue(vByteArray, index, _data.mRPMO         ))
-    if (GetValue(vByteArray, index, _data.mTargetFLPMO  ))
-    if (GetValue(vByteArray, index, _data.mCurrentA     ))
-    if (GetValue(vByteArray, index, _data.mDirection    ))
-    if (GetValue(vByteArray, index, _data.mMaxonRPM     ))
-        return true ;
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
+    if ( ! GetValue(vByteArray, index, _data.mRPMI         )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mDAC          )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mState        )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mRPMO         )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mTargetFLPMO  )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mCurrentA     )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mDirection    )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mMaxonRPM     )) goto lError;
+        
+    return true ;
+    
+lError:
+    if(vIndex) { *vIndex = index; }
+    
+    return false ;
 }
 
 /*!