diff --git a/essentials-framework/Essentials DM/Essentials_DM/AirMedia/AirMediaController.cs b/essentials-framework/Essentials DM/Essentials_DM/AirMedia/AirMediaController.cs
index 0d3b0237..0115465a 100644
--- a/essentials-framework/Essentials DM/Essentials_DM/AirMedia/AirMediaController.cs	
+++ b/essentials-framework/Essentials DM/Essentials_DM/AirMedia/AirMediaController.cs	
@@ -269,8 +269,12 @@ namespace PepperDash.Essentials.DM.AirMedia
         public void ExecuteNumericSwitch(ushort input, ushort output, eRoutingSignalType signalType)
         {
             if ((signalType & eRoutingSignalType.Video) != eRoutingSignalType.Video) return;
-            if (Enum.IsDefined(typeof (AmX00DisplayControl.eAirMediaX00VideoSource), input))
-                AirMedia.DisplayControl.VideoOut = (AmX00DisplayControl.eAirMediaX00VideoSource) input;
+            if (!Enum.IsDefined(typeof (AmX00DisplayControl.eAirMediaX00VideoSource), input))
+            {
+                Debug.Console(2, this, "Invalid Video Source Index : {0}", input);
+                return;
+            }
+            AirMedia.DisplayControl.VideoOut = (AmX00DisplayControl.eAirMediaX00VideoSource) input;
         }
 
         #endregion