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 {