Index: sources/model/dg/data/MDGOperationModeData.cpp
===================================================================
diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -ra09c1a91b8eaf9d7164ba7f274d4ccd557c05f22
--- sources/model/dg/data/MDGOperationModeData.cpp	(.../MDGOperationModeData.cpp)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
+++ sources/model/dg/data/MDGOperationModeData.cpp	(.../MDGOperationModeData.cpp)	(revision a09c1a91b8eaf9d7164ba7f274d4ccd557c05f22)
@@ -25,11 +25,15 @@
 
 bool MDGOperationMode::fromByteArray(const QByteArray &vByteArray, int *vIndex) {
     int index = 0; // message data start position
-    if (GetValue(vByteArray, index, _data.mOpMode   ))
-    if (GetValue(vByteArray, index, _data.mSubMode  ))
-                            return true ;
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
+    if ( ! GetValue(vByteArray, index, _data.mOpMode   )) goto lError;
+    if ( ! GetValue(vByteArray, index, _data.mSubMode  )) goto lError;
+
+    return true ;
+    
+lError:
+    if(vIndex) { *vIndex = index; }
+    
+    return false ;
 }
 
 /*!