Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -r6419179374edcd65da462de84e8aeaefb7e20320 -r9feea867113c62088f0ce91750127972dbd9bf53
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 6419179374edcd65da462de84e8aeaefb7e20320)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 9feea867113c62088f0ce91750127972dbd9bf53)
@@ -132,8 +132,7 @@
             break;
 
         default:
-            // TODO - s/w fault
-            currentStandbyState = STANDBY_START_STATE;
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_MODE_STANDBY_INVALID_STATE, currentStandbyState );
             break;
     }
 #else
@@ -218,7 +217,7 @@
             break;
 
         default:
-            // TODO - s/w fault
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_MODE_STANDBY_INVALID_STATE, currentStandbyState );
             currentStandbyState = STANDBY_START_STATE;
             break;
     }