diff --git a/PepperDashEssentials/UIDrivers/EssentialsHuddleVTC/EssentialsHuddleVtc1PanelAvFunctionsDriver.cs b/PepperDashEssentials/UIDrivers/EssentialsHuddleVTC/EssentialsHuddleVtc1PanelAvFunctionsDriver.cs
index 4b1f2188..be51a4aa 100644
--- a/PepperDashEssentials/UIDrivers/EssentialsHuddleVTC/EssentialsHuddleVtc1PanelAvFunctionsDriver.cs
+++ b/PepperDashEssentials/UIDrivers/EssentialsHuddleVTC/EssentialsHuddleVtc1PanelAvFunctionsDriver.cs
@@ -927,7 +927,10 @@ namespace PepperDash.Essentials
                 _CurrentRoom.CurrentSingleSourceChange += CurrentRoom_SourceInfoChange;
                 RefreshSourceInfo();
 
-				(_CurrentRoom.VideoCodec as IHasScheduleAwareness).CodecSchedule.MeetingsListHasChanged += CodecSchedule_MeetingsListHasChanged;
+                if (_CurrentRoom.VideoCodec is IHasScheduleAwareness)
+                {
+                    (_CurrentRoom.VideoCodec as IHasScheduleAwareness).CodecSchedule.MeetingsListHasChanged += CodecSchedule_MeetingsListHasChanged;
+                }
 
                 CallSharingInfoVisibleFeedback = new BoolFeedback(() => _CurrentRoom.VideoCodec.SharingContentIsOnFeedback.BoolValue);
                 _CurrentRoom.VideoCodec.SharingContentIsOnFeedback.OutputChange += SharingContentIsOnFeedback_OutputChange;
diff --git a/PepperDashEssentials/UIDrivers/VC/EssentialsVideoCodecUiDriver.cs b/PepperDashEssentials/UIDrivers/VC/EssentialsVideoCodecUiDriver.cs
index 15f90ff4..b035523e 100644
--- a/PepperDashEssentials/UIDrivers/VC/EssentialsVideoCodecUiDriver.cs
+++ b/PepperDashEssentials/UIDrivers/VC/EssentialsVideoCodecUiDriver.cs
@@ -1065,12 +1065,19 @@ namespace PepperDash.Essentials.UIDrivers.VC
         /// </summary>
         void SearchKeypadClear()
         {
-            SearchStringBuilder.Remove(0, SearchStringBuilder.Length);
-            SearchStringFeedback.FireUpdate();
-            SearchStringKeypadCheckEnables();
+            try
+            {
+                SearchStringBuilder.Remove(0, SearchStringBuilder.Length);
+                SearchStringFeedback.FireUpdate();
+                SearchStringKeypadCheckEnables();
 
-            if((Codec as IHasDirectory).CurrentDirectoryResultIsNotDirectoryRoot.BoolValue)
-                SetCurrentDirectoryToRoot();
+                if ((Codec as IHasDirectory).CurrentDirectoryResultIsNotDirectoryRoot.BoolValue)
+                    SetCurrentDirectoryToRoot();
+            }
+            catch (Exception e)
+            {
+                Debug.Console(1, "SearchKeypadClear() blew up!: {0}", e);
+            }
         }
 
         /// <summary>
diff --git a/essentials-framework b/essentials-framework
index 713be9a7..1a61f2b4 160000
--- a/essentials-framework
+++ b/essentials-framework
@@ -1 +1 @@
-Subproject commit 713be9a794efcb48043ed784b214f11cf21e145c
+Subproject commit 1a61f2b4886bab143b71ce97cf29fe0e8ec0647e