Index: firmware/App/Modes/FPModes/FPOperationModes.c
===================================================================
diff -u -rd7990b8e352be3c997124800b995fa5e6b63989f -rc69355cb062c3580725558809f66699f0d552e5a
--- firmware/App/Modes/FPModes/FPOperationModes.c	(.../FPOperationModes.c)	(revision d7990b8e352be3c997124800b995fa5e6b63989f)
+++ firmware/App/Modes/FPModes/FPOperationModes.c	(.../FPOperationModes.c)	(revision c69355cb062c3580725558809f66699f0d552e5a)
@@ -131,7 +131,7 @@
     // Is requested new mode valid and legal at this time?
     if ( ( newMode >= FP_MODE_NLEG ) && ( isTestingActivated() != TRUE ) )
     {
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_OP_MODES_ILLEGAL_MODE_TRANSITION_REQUESTED, newMode )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, FP_FAULT_ID_OP_MODES_ILLEGAL_MODE_TRANSITION_REQUESTED, newMode )
         newMode = currentMode;
     }
 
@@ -181,7 +181,7 @@
             break;
 
         default:
-            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_OP_MODES_INVALID_MODE_STATE, currentMode )
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, FP_FAULT_ID_OP_MODES_INVALID_MODE_STATE, currentMode )
             currentMode = FP_MODE_FAUL;
             currentSubMode = 0;
             break;
@@ -220,7 +220,7 @@
     }
     else
     {  // Invalid mode requested
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_OP_MODES_INVALID_MODE_REQUESTED, newMode )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, FP_FAULT_ID_OP_MODES_INVALID_MODE_REQUESTED, newMode )
     }
 }
 
@@ -348,7 +348,7 @@
 
 
         default:
-            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_OP_MODES_INVALID_MODE_TO_TRANSITION_TO, newMode )
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, FP_FAULT_ID_OP_MODES_ILLEGAL_MODE_TRANSITION_REQUESTED, newMode )
             break;
     }
 }
Index: firmware/App/Services/TDInterface.c
===================================================================
diff -u -rb212425c0c7e9b69b4de7d46dd41030dfc3efa62 -rc69355cb062c3580725558809f66699f0d552e5a
--- firmware/App/Services/TDInterface.c	(.../TDInterface.c)	(revision b212425c0c7e9b69b4de7d46dd41030dfc3efa62)
+++ firmware/App/Services/TDInterface.c	(.../TDInterface.c)	(revision c69355cb062c3580725558809f66699f0d552e5a)
@@ -342,14 +342,23 @@
     {
         PRE_GEN_DIALYSATE_REQ_PAYLOAD_T startPreGenRequest;
         DD_OP_MODE_T ddMode = getCurrentOperationMode();
+        FP_OP_MODE_T fpMode = getCurrentFPOperationMode();
 
         memcpy( &startPreGenRequest, message->payload, sizeof( PRE_GEN_DIALYSATE_REQ_PAYLOAD_T ) );
 
         // Process the pre-gen dialysate delivery request message
         if ( ( DD_MODE_STAN == ddMode ) && ( TRUE == startPreGenRequest.start ) )
         {
             // Start FP Pre-Generate Permeate
-            fpReason = signalStartGenPermeate();
+
+            if ( FP_MODE_STAN == fpMode )
+            {
+                fpReason = signalStartGenPermeate();
+            }
+            else
+            {
+                fpReason = REQUEST_REJECT_REASON_NOT_ALLOWED_IN_CURRENT_MODE;
+            }
             // start pre-gen dialysate
             result = requestDDPreGenStart();