Index: firmware/App/Modes/Prime.c
===================================================================
diff -u -r9fc107ffe0ed515acf970426ff467abd8e7247a8 -ree53e23ebcd35a6ef258ecf2f24a47dd47be71b0
--- firmware/App/Modes/Prime.c	(.../Prime.c)	(revision 9fc107ffe0ed515acf970426ff467abd8e7247a8)
+++ firmware/App/Modes/Prime.c	(.../Prime.c)	(revision ee53e23ebcd35a6ef258ecf2f24a47dd47be71b0)
@@ -257,22 +257,22 @@
  *************************************************************************/
 void signalStartPrime( void )
 {
-    BOOL accepted = FALSE;
-    REQUEST_REJECT_REASON_CODE_T rejReason = REQUEST_REJECT_REASON_NOT_ALLOWED_IN_CURRENT_MODE;
+    BOOL accepted = TRUE;
+    REQUEST_REJECT_REASON_CODE_T rejReason = REQUEST_REJECT_REASON_NONE;
 
-    if ( HD_PRIME_WAIT_FOR_USER_START_STATE == currentPrimeState )
+    if ( currentPrimeState != HD_PRIME_WAIT_FOR_USER_START_STATE )
     {
+        accepted = FALSE;
+        rejReason = REQUEST_REJECT_REASON_NOT_ALLOWED_IN_CURRENT_MODE;
+    }
+    else if ( getReservoirFillStatus( DG_RESERVOIR_1 ) != TRUE )
+    {
+        accepted = FALSE;
+        rejReason = REQUEST_REJECT_REASON_RESERVOIR_ONE_IS_NOT_READY;
+    }
+    else
+    {
         primeStartRequested = TRUE;
-        rejReason = REQUEST_REJECT_REASON_NONE;
-
-        if ( TRUE == getReservoirFillStatus( DG_RESERVOIR_1 ) )
-        {
-            accepted = TRUE;
-        }
-        else
-        {
-            rejReason = REQUEST_REJECT_REASON_RESERVOIR_ONE_IS_NOT_READY;
-        }
     }
 
     sendStartPrimeCmdResponse( accepted, rejReason );
@@ -655,7 +655,7 @@
                 state = HD_PRIME_RESERVOIR_TWO_FILL_COMPLETE_STATE;
             }
 #else
-                state = HD_PRIME_RESERVOIR_TWO_FILL_COMPLETE_STATE;
+            state = HD_PRIME_RESERVOIR_TWO_FILL_COMPLETE_STATE;
 #endif
         }
     }