diff --git a/source/ChanSort.Loader.TCL/DtvDataSerializer.cs b/source/ChanSort.Loader.TCL/DtvDataSerializer.cs
index 1082c8a..f9514cf 100644
--- a/source/ChanSort.Loader.TCL/DtvDataSerializer.cs
+++ b/source/ChanSort.Loader.TCL/DtvDataSerializer.cs
@@ -385,9 +385,9 @@ left outer join CurCIOPSerType c on c.u8DtvRoute=p.u8DtvRoute
       cmd.Prepare();
 
 #if !TestBuild
-      //cmdDelete.CommandText = @"delete from PrograminfoTbl where u32Index=@handle;";
-      //cmdDelete.Parameters.Add("@handle", SqliteType.Integer);
-      //cmdDelete.Prepare();
+      cmdDelete.CommandText = @"delete from PrograminfoTbl where u32Index=@handle;";
+      cmdDelete.Parameters.Add("@handle", SqliteType.Integer);
+      cmdDelete.Prepare();
 #endif
 
       foreach (ChannelInfo channel in channelList.Channels)
diff --git a/source/ChanSort/MainForm.cs b/source/ChanSort/MainForm.cs
index c74f410..19f0693 100644
--- a/source/ChanSort/MainForm.cs
+++ b/source/ChanSort/MainForm.cs
@@ -1399,7 +1399,11 @@ namespace ChanSort.Ui
         foreach (var rowHandle in gview.GetSelectedRows())
         {
           if (gview.IsDataRow(rowHandle))
-            channels.Add((ChannelInfo) gview.GetRow(rowHandle));
+          {
+            var chan = (ChannelInfo)gview.GetRow(rowHandle); // this method get called while updating the grid, resulting in NULL objects to be returned
+            if (chan != null)
+              channels.Add(chan);
+          }
         }
       }
 
diff --git a/source/changelog.md b/source/changelog.md
index 29f013c..30c5237 100644
--- a/source/changelog.md
+++ b/source/changelog.md
@@ -1,6 +1,9 @@
 ChanSort Change Log 
 ===================
 
+2023-01-10
+- TCL: fixed deleting channels
+
 2023-01-08
 - TCL/Thomson .tar: custom implementation for reading/writing .tar archives, preserving all 
   unix file metadata (based on "old-GNU" .tar flavor, like the files exported by the TV)