Index: firmware/App/Modes/ModeUpdate.c
===================================================================
diff -u -rc74c1d99a011dd0fb7f98f183faecda675221fce -radea34db9066bdc0dbb20f49bdf66c9331a7037c
--- firmware/App/Modes/ModeUpdate.c	(.../ModeUpdate.c)	(revision c74c1d99a011dd0fb7f98f183faecda675221fce)
+++ firmware/App/Modes/ModeUpdate.c	(.../ModeUpdate.c)	(revision adea34db9066bdc0dbb20f49bdf66c9331a7037c)
@@ -39,7 +39,7 @@
  * @brief
  * The transitionToUpdateMode function prepares for transition to Update Mode.
  * @details \b Inputs: none
- * @details \b Outputs: Standby Mode unit re-initialized
+ * @details \b Outputs: Update Mode unit re-initialized
  * @return none
  *************************************************************************/
 U32 transitionToUpdateMode( void )
@@ -51,7 +51,7 @@
     // Got the update command so we are in the update mode. Clear the command
     clearSWUpdateCommandState();
 
-    return 0;
+    return updateCurrentState;
 }
 
 /*********************************************************************//**
@@ -82,7 +82,7 @@
             break;
     }
 
-    return 0;
+    return updateCurrentState;
 }
 
 /*********************************************************************//**
@@ -96,8 +96,9 @@
 static MODE_SW_UPDATE_STATE_T handleUpdateModeUpdateState( void )
 {
     MODE_SW_UPDATE_STATE_T state = SW_UPDATE_UPDATE_STATE;
+    SW_UPDATE_CMD_T cmd          = getSWUpdateCommandState();
 
-    switch( getSWUpdateCommandState() )
+    switch( cmd )
     {
         case UPDATE_CMD_VERIFY:
             state = SW_UPDATE_VERIFY_STATE;
@@ -129,8 +130,9 @@
 static MODE_SW_UPDATE_STATE_T handleUpdateModeVerifyState( void )
 {
     MODE_SW_UPDATE_STATE_T state = SW_UPDATE_VERIFY_STATE;
+    SW_UPDATE_DESINTATION_T dest = getSWUpdateDestination();
 
-    switch( getSWUpdateDestination() )
+    switch( dest )
     {
         case UPDATE_FPGA:
             if ( TRUE == isFPGAFlashComplete() )