Index: firmware/App/Controllers/SyringePump.c
===================================================================
diff -u -r9fda0ba6fa4ca547e9c922765f95570c8d94df48 -rf5e10b23e6845efcc72d0e96891fa1f3dc5d749f
--- firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision 9fda0ba6fa4ca547e9c922765f95570c8d94df48)
+++ firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision f5e10b23e6845efcc72d0e96891fa1f3dc5d749f)
@@ -1424,8 +1424,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
@@ -1476,6 +1478,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 );
 
@@ -1541,6 +1546,9 @@
         }
     }
 
+    // Check for stall
+    stopPump = checkForStall( stopPump );
+
     // Has syringe been removed?
     stopPump = checkSyringeRemoved( stopPump );