Index: firmware/App/Controllers/SyringePump.c
===================================================================
diff -u -rccd30f78626597083d05d343651b334b87b46e46 -rf8b6bd0307bf973446384bf52d233673879595b9
--- firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision ccd30f78626597083d05d343651b334b87b46e46)
+++ firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision f8b6bd0307bf973446384bf52d233673879595b9)
@@ -1422,8 +1422,10 @@
         SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SYRINGE_PUMP_OVER_TRAVEL_ERROR, (U32)getSyringePumpPosition(), (U32)SYRINGE_PUMP_RETRACT_STATE );
     }
 
+    // Check for stall
     stopPump = checkForStall( stopPump );
 
+    // Check direction
     stopPump = checkDirection( stopPump, MOTOR_DIR_REVERSE );
 
     // If anything found that would require stopping the pump, stop pump and go to off state
@@ -1474,6 +1476,9 @@
         syringePumpPreLoadCompleted = TRUE;
     }
 
+    // Check for stall
+    stopPump = checkForStall( stopPump );
+
     // Check max position > empty + 0.5 mL
     stopPump = checkMaxTravel( stopPump, SYRINGE_PUMP_EMPTY_POS + SYRINGE_PUMP_EMPTY_POS_MARGIN );
 
@@ -1539,6 +1544,9 @@
         }
     }
 
+    // Check for stall
+    stopPump = checkForStall( stopPump );
+
     // Has syringe been removed?
     stopPump = checkSyringeRemoved( stopPump );