Index: sources/canbus/MessageInterpreter.cpp
===================================================================
diff -u -r28f3f8dd18981262995386d29d3c2ab31418bfc4 -rc1111db9c22ad5a8d284f4f15e3d7ba824a2d54b
--- sources/canbus/MessageInterpreter.cpp	(.../MessageInterpreter.cpp)	(revision 28f3f8dd18981262995386d29d3c2ab31418bfc4)
+++ sources/canbus/MessageInterpreter.cpp	(.../MessageInterpreter.cpp)	(revision c1111db9c22ad5a8d284f4f15e3d7ba824a2d54b)
@@ -37,6 +37,14 @@
     LOG_EVENT(vMODEL::toString(vData));                             \
     DEBUG_RECEIVE_SIGNAL(0, typeid(vMODEL).name())
 
+// another version of the INTERPRET_RECEIVED_MESSAGE for empty messages
+// same later improvements apply to this MACRO as well.
+#define INTERPRET_RECVD_MT_MESSAGE(vMODEL)                          \
+    if (   length ) { logInvalidLength(vActionId); return false; }  \
+    vPayload = Format::fromVariant(vData);                          \
+    LOG_EVENT(vMODEL::toString(vData));                             \
+    DEBUG_RECEIVE_SIGNAL(0, typeid(vMODEL).name())
+
 /*!
  * \brief MessageInterpreter::MessageInterpreter
  * \details Constructor
@@ -217,21 +225,26 @@
         break;
 
     case Gui::GuiActionType::ID_PowerOff                            : INTERPRET_RECEIVED_MESSAGE(AdjustPowerOffRequestData              ); break;
-    case Gui::GuiActionType::ID_AdjustBloodDialysateReq             : INTERPRET_RECEIVED_MESSAGE(AdjustBloodDialysateRequestData        ); break;
+    // in-treatment
     case Gui::GuiActionType::ID_AdjustDurationReq                   : INTERPRET_RECEIVED_MESSAGE(AdjustDurationRequestData              ); break;
+    case Gui::GuiActionType::ID_AdjustBloodDialysateReq             : INTERPRET_RECEIVED_MESSAGE(AdjustBloodDialysateRequestData        ); break;
+    case Gui::GuiActionType::ID_AdjustPressuresLimitsReq            : INTERPRET_RECEIVED_MESSAGE(AdjustPressuresLimitsRequestData       ); break;
+    case Gui::GuiActionType::ID_AdjustSalineReq                     : INTERPRET_RECEIVED_MESSAGE(AdjustSalineRequestData                ); break;
+    case Gui::GuiActionType::ID_AdjustHeparinReq                    : INTERPRET_RECEIVED_MESSAGE(AdjustHeparinRequestData               ); break;
+    // in-treatment - ultrafiltration
     case Gui::GuiActionType::ID_AdjustUltrafiltrationInitReq        : INTERPRET_RECEIVED_MESSAGE(AdjustUltrafiltrationInitRequestData   ); break;
     case Gui::GuiActionType::ID_AdjustUltrafiltrationStateReq       : INTERPRET_RECEIVED_MESSAGE(AdjustUltrafiltrationStateRequestData  ); break;
     case Gui::GuiActionType::ID_AdjustUltrafiltrationEditReq        : INTERPRET_RECEIVED_MESSAGE(AdjustUltrafiltrationEditRequestData   ); break;
     case Gui::GuiActionType::ID_AdjustUltrafiltrationConfirmReq     : INTERPRET_RECEIVED_MESSAGE(AdjustUltrafiltrationConfirmRequestData); break;
-    case Gui::GuiActionType::ID_AdjustSalineReq                     : INTERPRET_RECEIVED_MESSAGE(AdjustSalineRequestData                ); break;
-    case Gui::GuiActionType::ID_AdjustHeparinReq                    : INTERPRET_RECEIVED_MESSAGE(AdjustHeparinRequestData               ); break;
-    case Gui::GuiActionType::ID_AdjustPressuresLimitsReq            : INTERPRET_RECEIVED_MESSAGE(AdjustPressuresLimitsRequestData       ); break;
-    case Gui::GuiActionType::ID_AlarmSilenceReq                     : INTERPRET_RECEIVED_MESSAGE(AlarmSilenceRequestData                ); break;
-    case Gui::GuiActionType::ID_AlarmUserAckReq                     : INTERPRET_RECEIVED_MESSAGE(AlarmAcknowledgeRequestData            ); break;
+    // pre-Treatment
     case Gui::GuiActionType::ID_StartTreatmentReq                   : INTERPRET_RECEIVED_MESSAGE(StartTreatmentRequestData              ); break;
     case Gui::GuiActionType::ID_ConfirmTreatmentReq                 : INTERPRET_RECEIVED_MESSAGE(ConfirmTreatmentRequestData            ); break;
-    case Gui::GuiActionType::ID_EndTreatmentReq                     : INTERPRET_RECEIVED_MESSAGE(EndTreatmentRequestData                ); break;
+    case Gui::GuiActionType::ID_EndTreatmentReq                     : INTERPRET_RECVD_MT_MESSAGE(EndTreatmentRequestData                ); break;
     case Gui::GuiActionType::ID_CreateTreatmentReq                  : INTERPRET_RECEIVED_MESSAGE(AdjustTreatmentParametersRequestData   ); break;
+    // alarms
+    case Gui::GuiActionType::ID_AlarmSilenceReq                     : INTERPRET_RECEIVED_MESSAGE(AlarmSilenceRequestData                ); break;
+    case Gui::GuiActionType::ID_AlarmUserAckReq                     : INTERPRET_RECEIVED_MESSAGE(AlarmAcknowledgeRequestData            ); break;
+
     default:
         QString mActionIdHexString = Format::toHexString(vActionId);
         LOG_DEBUG(mSenderID + tr("Unknown transmit Message with ID '%1'").arg(mActionIdHexString));