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;
     }
 }
Index: firmware/App/Monitors/Level.c
===================================================================
diff -u -r97324225f3a465c46b9cbfe4083814b0eb5576a6 -rcfa8ae21594d3471c37079eb708761fe9a047776
--- firmware/App/Monitors/Level.c	(.../Level.c)	(revision 97324225f3a465c46b9cbfe4083814b0eb5576a6)
+++ firmware/App/Monitors/Level.c	(.../Level.c)	(revision cfa8ae21594d3471c37079eb708761fe9a047776)
@@ -15,7 +15,6 @@
 *
 ***************************************************************************/
 
-
 #include "FpgaDD.h"
 #include "Level.h"
 #include "MessageSupport.h"
Index: firmware/App/Services/AlarmMgmtSWFaults.h
===================================================================
diff -u -rb569bc796c56acd5d94d468386f5f42c350cad65 -rcfa8ae21594d3471c37079eb708761fe9a047776
--- firmware/App/Services/AlarmMgmtSWFaults.h	(.../AlarmMgmtSWFaults.h)	(revision b569bc796c56acd5d94d468386f5f42c350cad65)
+++ firmware/App/Services/AlarmMgmtSWFaults.h	(.../AlarmMgmtSWFaults.h)	(revision cfa8ae21594d3471c37079eb708761fe9a047776)
@@ -149,6 +149,7 @@
     SW_FAULT_ID_RINSE_PUMP_INVALID_EXEC_STATE = 118,
     SW_FAULT_ID_RINSE_PUMP_INVALID_STATE1 = 119,
     SW_FAULT_ID_CONDUCTIVITY_SENOR_INVALID_STATE = 120,
+    SW_FAULT_ID_INVALID_RINSE_PUMP = 121,
     NUM_OF_SW_FAULT_IDS
 } DD_SW_FAULT_ID_T;
 
Index: firmware/App/Services/FpgaDD.c
===================================================================
diff -u -red2e81c8f4618d08b2842d47b4897c5990f5cb76 -rcfa8ae21594d3471c37079eb708761fe9a047776
--- firmware/App/Services/FpgaDD.c	(.../FpgaDD.c)	(revision ed2e81c8f4618d08b2842d47b4897c5990f5cb76)
+++ firmware/App/Services/FpgaDD.c	(.../FpgaDD.c)	(revision cfa8ae21594d3471c37079eb708761fe9a047776)
@@ -3072,18 +3072,21 @@
  *************************************************************************/
 U16 getFPGAD63LevelSensor( void )
 {
+    U08 result;
 #if 1    // Remove when Beta 1.9 is obsolete
     if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) == TRUE )
     {
-        return ( fpgaSensorReadings.fpgaConductiveLevelStatus & FPGA_D63_LEVEL_BIT );
+        result = ( fpgaSensorReadings.fpgaConductiveLevelStatus & FPGA_D63_LEVEL_BIT );
     }
     else
     {
-        return fpgaBeta19SensorReadings.fpgaD63LevelSensor;
+        result = fpgaBeta19SensorReadings.fpgaD63LevelSensor;
     }
 #else
-    return GET_FPGA_SENSOR_FIELD( fpgaConductiveLevelStatus );
+    result = GET_FPGA_SENSOR_FIELD( fpgaConductiveLevelStatus );
 #endif
+
+    return result;
 }
 
 /*********************************************************************//**
@@ -3096,18 +3099,21 @@
  *************************************************************************/
 U16 getFPGAD98LevelSensor( void )
 {
+    U08 result;
 #if 1    // Remove when Beta 1.9 is obsolete
     if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) == TRUE )
     {
-        return ( fpgaSensorReadings.fpgaConductiveLevelStatus & FPGA_D98_LEVEL_BIT );
+        result = ( fpgaSensorReadings.fpgaConductiveLevelStatus & FPGA_D98_LEVEL_BIT );
     }
     else
     {
-        return fpgaBeta19SensorReadings.fpgaD98LevelSensor;
+        result = fpgaBeta19SensorReadings.fpgaD98LevelSensor;
     }
 #else
-    return GET_FPGA_SENSOR_FIELD( fpgaConductiveLevelStatus );
+    result = GET_FPGA_SENSOR_FIELD( fpgaConductiveLevelStatus );
 #endif
+
+    return result;
 }
 
 /*********************************************************************//**
@@ -3120,18 +3126,21 @@
  *************************************************************************/
 U16 getFPGAD46LevelSensor( void )
 {
+    U08 result;
 #if 1    // Remove when Beta 1.9 is obsolete
     if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) == TRUE )
     {
-        return ( fpgaSensorReadings.fpgaConductiveLevelStatus & FPGA_D46_LEVEL_BIT );
+        result = ( fpgaSensorReadings.fpgaConductiveLevelStatus & FPGA_D46_LEVEL_BIT );
     }
     else
     {
-        return fpgaBeta19SensorReadings.fpgaD46LevelSensor;
+        result = fpgaBeta19SensorReadings.fpgaD46LevelSensor;
     }
 #else
-    return GET_FPGA_SENSOR_FIELD( fpgaConductiveLevelStatus );
+    result = GET_FPGA_SENSOR_FIELD( fpgaConductiveLevelStatus );
 #endif
+
+    return result;
 }
 
 /*********************************************************************//**
@@ -3157,18 +3166,21 @@
  *************************************************************************/
 U08 getFPGAFloater2Status( void )
 {
+    U08 result;
 #if 1    // Remove when Beta 1.9 is obsolete
     if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) == TRUE )
     {
-        return fpgaSensorReadings.fpgaConductiveLevelStatus;
+        result = fpgaSensorReadings.fpgaConductiveLevelStatus;
     }
     else
     {
-        return fpgaBeta19SensorReadings.fpgaFloater2Status;
+        result = fpgaBeta19SensorReadings.fpgaFloater2Status;
     }
 #else
-    return GET_FPGA_SENSOR_FIELD( fpgaConductiveLevelStatus );
+    result = GET_FPGA_SENSOR_FIELD( fpgaConductiveLevelStatus );
 #endif
+
+    return result;
 }
 
 /*********************************************************************//**