Index: firmware/App/Modes/Dialysis.c
===================================================================
diff -u -r88ee6f3dce69a3dadb012bb8a39c3fd167ba0afd -rdb22e9d530c5c9d62b02e6dcc72ed96fb67c165a
--- firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision 88ee6f3dce69a3dadb012bb8a39c3fd167ba0afd)
+++ firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision db22e9d530c5c9d62b02e6dcc72ed96fb67c165a)
@@ -887,15 +887,13 @@
     bolusSalineMotorCount = u32BiDiffWithWrap( bolusSalineLastMotorCount, getBloodPumpMotorCount() ) / BP_HALL_EDGE_COUNTS_PER_REV;
     bolusSalineVolumeDelivered_Safety = ( (F32)bolusSalineMotorCount * VOLUME_PER_BP_MOTOR_REV_ML );  // TODO - include upstream pressure compensation to this calc (from PBA).
 
-#ifndef DISABLE_SALINE_BOLUS_CHECKS
-    // TODO - check for empty saline bag
-    if ( 0 )
+    // Check for empty saline bag
+    if ( TRUE == isSalineBagEmpty() )
     {
-        SET_ALARM_WITH_1_F32_DATA( ALARM_ID_EMPTY_SALINE_BAG, 0.0 );  // TODO - give data supporting empty bag detection
+        activateAlarmNoData( ALARM_ID_EMPTY_SALINE_BAG );
         errorFound = TRUE;
         result = SALINE_BOLUS_STATE_IDLE;
     }
-#endif
 
     // Determine if we have reached maximum saline delivery volume
     if ( ( totalSalineVolumeDelivered >= (F32)MAX_SALINE_VOLUME_DELIVERED ) )
@@ -910,7 +908,7 @@
             // If safety thinks we have under-delivered the bolus, throw a fault
             if ( bolusSalineVolumeDelivered_Safety < ( bolusTargetVolume * MIN_SALINE_BOLUS_VOLUME_PCT ) )
             {
-#ifndef DISABLE_SALINE_BOLUS_CHECKS
+#ifndef DISABLE_PUMP_FLOW_CHECKS
                 SET_ALARM_WITH_2_F32_DATA( ALARM_ID_SALINE_BOLUS_VOLUME_CHECK_FAILURE, bolusTargetVolume, bolusSalineVolumeDelivered_Safety );
                 errorFound = TRUE;
 #endif
@@ -926,7 +924,7 @@
         // Determine if safety thinks we have over-delivered the bolus
         else if ( bolusSalineVolumeDelivered_Safety > ( bolusTargetVolume * MAX_SALINE_BOLUS_VOLUME_PCT ) )
         {
-#ifndef DISABLE_SALINE_BOLUS_CHECKS
+#ifndef DISABLE_PUMP_FLOW_CHECKS
             SET_ALARM_WITH_2_F32_DATA( ALARM_ID_SALINE_BOLUS_VOLUME_CHECK_FAILURE, bolusTargetVolume, bolusSalineVolumeDelivered_Safety );
             errorFound = TRUE;
             result = SALINE_BOLUS_STATE_IDLE;