Index: firmware/App/Controllers/SyringePump.c
===================================================================
diff -u -raa8b9687b9396b4878cf0d5327d72a5d67477761 -r6cd6054a5e170246f94a48b3623d277bba3928d5
--- firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision aa8b9687b9396b4878cf0d5327d72a5d67477761)
+++ firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision 6cd6054a5e170246f94a48b3623d277bba3928d5)
@@ -92,7 +92,7 @@
 #define MIN_SYRINGE_PUMP_RATE_FOR_DIR_ALARM           0.5F                                  ///< Minimum measured rate (in mL/hr) required before enforcing direction alarm.
 
 /// Expected position of empty in relation to home position.
-#define SYRINGE_PUMP_EMPTY_POS                        ( SYRINGE_ENCODER_COUNTS_PER_ML * 10.84F )
+#define SYRINGE_PUMP_EMPTY_POS                        ( SYRINGE_ENCODER_COUNTS_PER_ML * 11.0F )
 /// Margin of error for empty position determination.
 #define SYRINGE_PUMP_EMPTY_POS_MARGIN                 ( SYRINGE_ENCODER_COUNTS_PER_ML * 0.5F )
 /// Minimum retract position.
@@ -1815,7 +1815,7 @@
     S32  pos = getSyringePumpPosition();
 
     // If near empty position, assume syringe is empty
-    if ( fabs( pos - SYRINGE_PUMP_EMPTY_POS ) < SYRINGE_PUMP_EMPTY_POS_MARGIN )
+    if ( pos >= SYRINGE_PUMP_EMPTY_POS )
     {
         heparinDeliveryState = HEPARIN_STATE_EMPTY;
         SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_SYRINGE_PUMP_SYRINGE_EMPTY, (F32)pos, force )
@@ -1888,20 +1888,11 @@
     BOOL result = stopPump;
     S32 pos = getSyringePumpPosition();
 
-    if ( pos > ( SYRINGE_PUMP_EMPTY_POS - SYRINGE_PUMP_EMPTY_POS_MARGIN ) )
+    if ( pos >= maxPos )
     {
         result = TRUE;
-        heparinDeliveryState = HEPARIN_STATE_EMPTY;
-        SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_SYRINGE_PUMP_SYRINGE_EMPTY, (F32)pos, getSyringePumpForceV() )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SYRINGE_PUMP_OVER_TRAVEL_ERROR, (U32)pos, (U32)syringePumpState );
     }
-    else if ( pos > maxPos )
-    {
-        result = TRUE;
-        if ( syringePumpState != SYRINGE_PUMP_PRIME_STATE )
-        {
-            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SYRINGE_PUMP_OVER_TRAVEL_ERROR, (U32)pos, (U32)syringePumpState );
-        }
-    }
 
     return result;
 }