Index: firmware/App/Controllers/RinsePump.c
===================================================================
diff -u -r97324225f3a465c46b9cbfe4083814b0eb5576a6 -rcfa8ae21594d3471c37079eb708761fe9a047776
--- firmware/App/Controllers/RinsePump.c	(.../RinsePump.c)	(revision 97324225f3a465c46b9cbfe4083814b0eb5576a6)
+++ firmware/App/Controllers/RinsePump.c	(.../RinsePump.c)	(revision cfa8ae21594d3471c37079eb708761fe9a047776)
@@ -152,6 +152,8 @@
  *************************************************************************/
 void execRinsePumpController( void )
 {
+    calculateRinsePumpSpeed();
+
     switch( currentRinsePumpState )
     {
         case RINSE_PUMP_STATE_INIT:
@@ -171,7 +173,6 @@
             break;
     }
 
-    calculateRinsePumpSpeed();
     publishRinsePumpData();
 }
 
@@ -259,7 +260,7 @@
             break;
 
         default:
-            // No other rinse pumps defined yet; ignore for now.
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_RINSE_PUMP, pumpId );
             break;
     }
 }