Index: firmware/App/Modes/ModeFault.c
===================================================================
diff -u -rb57e35bcded6968444b66e7a58dec34c3dd99082 -r8749beb3f7bed2f9d7fcd2c6916496ea300d9f9d
--- firmware/App/Modes/ModeFault.c	(.../ModeFault.c)	(revision b57e35bcded6968444b66e7a58dec34c3dd99082)
+++ firmware/App/Modes/ModeFault.c	(.../ModeFault.c)	(revision 8749beb3f7bed2f9d7fcd2c6916496ea300d9f9d)
@@ -114,6 +114,7 @@
  *************************************************************************/
 U32 execFaultMode( void )
 {
+    // The stop button press events are consumed here upon requesting to stop.
     isStopButtonPressed();
 
     switch( faultState )
@@ -129,7 +130,7 @@
         default:
             // Fault in fault mode is needed?
             SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_MODE_FAULT_INVALID_STATE, (U32)faultState )
-            faultState = TD_FAULT_DEENERGIZED_STATE;
+            faultState = TD_FAULT_ENERGIZED_STATE;
             break;
     }
 
@@ -168,7 +169,7 @@
             setValvePosition( H19_VALV, VALVE_POSITION_C_CLOSE );
             set3WayValveState( H13_VALV, VALVE_3WAY_COMMON_TO_CLOSED_STATE );
             set3WayValveState( H20_VALV, VALVE_3WAY_COMMON_TO_CLOSED_STATE );
-            // Not calling ejector means off
+            abortEjector();
             //    stopSyringePump();
             break;
 
@@ -179,7 +180,7 @@
             setValvePosition( H19_VALV, VALVE_POSITION_C_CLOSE );
             set3WayValveState( H13_VALV, VALVE_3WAY_COMMON_TO_CLOSED_STATE );
             set3WayValveState( H20_VALV, VALVE_3WAY_COMMON_TO_CLOSED_STATE );
-            // Not calling ejector means off
+            abortEjector();
             //    stopSyringePump();
             break;