Index: firmware/App/Services/StateServices/TubeSetInstall.c
===================================================================
diff -u -r0b025cea0b0f290ea44714a8fae6d71ea05088b9 -r4ea39ac34ede5011de1954b7c58761df25120fcf
--- firmware/App/Services/StateServices/TubeSetInstall.c	(.../TubeSetInstall.c)	(revision 0b025cea0b0f290ea44714a8fae6d71ea05088b9)
+++ firmware/App/Services/StateServices/TubeSetInstall.c	(.../TubeSetInstall.c)	(revision 4ea39ac34ede5011de1954b7c58761df25120fcf)
@@ -75,7 +75,7 @@
     bloodPumpTimerCounter  = 0;
     bpLastHome             = TRUE;
     bpLeftHomeTimerCounter = 0;
-    currentTubeSetType     = TUBE_SET_TYPE_HD;  // TODO: Call setTubeSetType() when barcode scanning is implemented.
+    currentTubeSetType     = TUBE_SET_TYPE_UNKNOWN;
 }
 
 /*********************************************************************//**
@@ -345,7 +345,14 @@
  *************************************************************************/
 void setTubeSetType( TUBE_SET_TYPE_T type )
 {
-    currentTubeSetType = type;
+    if ( type < NUM_OF_TUBE_SET_TYPES )
+    {
+        currentTubeSetType = type;
+    }
+    else
+    {
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_TUBE_SET_TYPE, (U32)type );
+    }
 }
 
 /*********************************************************************//**