Index: sources/gui/qml/pages/treatment/TreatmentStack.qml
===================================================================
diff -u -r627062628b60e4d512ee8830c2dbc23eef02fe28 -r5601274da6b6a67a1887c3994640a47549ae9e26
--- sources/gui/qml/pages/treatment/TreatmentStack.qml	(.../TreatmentStack.qml)	(revision 627062628b60e4d512ee8830c2dbc23eef02fe28)
+++ sources/gui/qml/pages/treatment/TreatmentStack.qml	(.../TreatmentStack.qml)	(revision 5601274da6b6a67a1887c3994640a47549ae9e26)
@@ -191,7 +191,7 @@
     Connections { target: vTreatmentAdjustmentPressuresLimits
         function onAdjustmentTriggered              ( vValue ) {
             if (vTreatmentAdjustmentPressuresLimits.adjustment_Accepted) {
-                _treatmentAdjustmentPressuresLimits.close()
+                if ( _treatmentAdjustmentPressuresLimits.isValid ) { _treatmentAdjustmentPressuresLimits.close() }
             }
             else {
                 _treatmentAdjustmentPressuresLimits.notification.text = vTreatmentAdjustmentPressuresLimits.text()
@@ -202,14 +202,13 @@
     Connections { target: vTreatmentAdjustmentSetPoints
         function onAdjustmentTriggered              ( vValue ) {
             if (vTreatmentAdjustmentSetPoints.adjustment_Accepted) {
-                // TODO update setpoints here?
-                vTreatmentCreate.treatmentModality                  =  _treatmentAdjustmentSetPoints.treatmentModality
+                vTreatmentCreate.treatmentModality                  = _treatmentAdjustmentSetPoints.treatmentModality
                 vTreatmentCreate.acidConcentrate                    = _treatmentAdjustmentSetPoints.acidConcentrate
                 vTreatmentCreate.dryBicarbCartSize                  = _treatmentAdjustmentSetPoints.bicarbConcentrate
                 vTreatmentCreate.hepatitusBStatus                   = _treatmentAdjustmentSetPoints.hepatitus
                 vTreatmentCreate.sodium                             = _treatmentAdjustmentSetPoints.sodium
                 vTreatmentCreate.bicarbonate                        = _treatmentAdjustmentSetPoints.bicarbonate
-                _treatmentAdjustmentSetPoints.close()
+                if ( _treatmentAdjustmentSetPoints.isValid ) { _treatmentAdjustmentSetPoints.close() }
             }
             else {
                 _treatmentAdjustmentSetPoints.notification.text = vTreatmentAdjustmentSetPoints.text()