diff --git a/TBF/BenchControl/Elde/Diverter/Diverter.cs b/TBF/BenchControl/Elde/Diverter/Diverter.cs
index 8abc570bd..47a1ec102 100644
--- a/TBF/BenchControl/Elde/Diverter/Diverter.cs
+++ b/TBF/BenchControl/Elde/Diverter/Diverter.cs
@@ -92,7 +92,11 @@ namespace TBF.BenchControl.Elde.Diverter
 			}
 
 
-            int divNrFromName = int.Parse(Name.Substring(3));
+            int divNrFromName;
+            if (!int.TryParse(Name.Substring(3), out divNrFromName))
+            {
+                divNrFromName = nextIdx;
+            }
 #if GENESIS || PETERSBURG_50 || PETERSBURG_200 || FUZHOU_40 || FUZHOU150 || FUZHOU300
             flowMtrNr4Cmd = divNrFromName + 1;
 #elif BADGER_STREDNA_TRAT
diff --git a/TBF/BenchControl/TbfComponents.cs b/TBF/BenchControl/TbfComponents.cs
index 36917bf96..cde83bc0c 100644
--- a/TBF/BenchControl/TbfComponents.cs
+++ b/TBF/BenchControl/TbfComponents.cs
@@ -170,7 +170,10 @@ namespace TBF.BenchControl
 		public static IComponentCfg CmpntCfgFromCmpntEntity(Component entity)
 		{
             IComponentFactory cmpntFactory = CmpntFactoryFromClassName(entity.ClassName);
-            return (cmpntFactory != null) ? cmpntFactory.CmpntCfgFromCmpntEntity(entity) : null;
+            if (cmpntFactory == null) return null;
+
+            try { return cmpntFactory.CmpntCfgFromCmpntEntity(entity); }
+            catch { return null; }
 		}
 
 
diff --git a/TBF/ComponentsManagerDlg.cs b/TBF/ComponentsManagerDlg.cs
index 699b22212..5c55449b6 100644
--- a/TBF/ComponentsManagerDlg.cs
+++ b/TBF/ComponentsManagerDlg.cs
@@ -188,35 +188,28 @@ namespace TBF
 
 		void DrawOne(Component cmpnt)
 		{
-			IComponentCfg cmpCfg = TbfComponents.CmpntCfgFromCmpntEntity(cmpnt);
+            ListViewItem lvi = new ListViewItem(cmpnt.Name);
+            lvi.Tag = cmpnt;
+            lvi.SubItems.Add(string.IsNullOrEmpty(cmpnt.ClassName) ? string.Empty : cmpnt.ClassName);
+            lvi.SubItems.Add(string.IsNullOrEmpty(cmpnt.ParentName) ? string.Empty : cmpnt.ParentName);
 
-			if (cmpCfg != null)
+            IComponentCfg cmpCfg = TbfComponents.CmpntCfgFromCmpntEntity(cmpnt);
+            if (cmpCfg != null)
 			{
-				ListViewItem lvi = new ListViewItem(cmpCfg.Name);
-				lvi.SubItems.Add(cmpCfg.Factory.ClassName);
-				lvi.SubItems.Add(cmpCfg.ParentName);
-				lvi.SubItems.Add(cmpCfg.DebugLevel.ToDescription());
+                lvi.SubItems.Add(cmpCfg.DebugLevel.ToDescription());
 				lvi.SubItems.Add(cmpCfg.LogLevel.ToDescription());
 				lvi.SubItems.Add(cmpCfg.ToString(1));
 
-				lvi.Tag = cmpnt;
-
-				listViewEx.Items.Add(lvi);
 			}
 			else
 			{
-				ListViewItem lvi = new ListViewItem(cmpnt.Name);
-				lvi.SubItems.Add(string.IsNullOrEmpty(cmpnt.ClassName) ? string.Empty : cmpnt.ClassName);
-				lvi.SubItems.Add(string.IsNullOrEmpty(cmpnt.ParentName) ? string.Empty : cmpnt.ParentName);
 				lvi.SubItems.Add("---");
 				lvi.SubItems.Add("---");
 				lvi.SubItems.Add("Not a component");
-
-				lvi.Tag = cmpnt;
-
-				listViewEx.Items.Add(lvi);
 			}
-		}
+
+            listViewEx.Items.Add(lvi);
+        }
 
         ///
         /// Save DB changes, return true when DB changes saved OK
diff --git a/TBF/Properties/AssemblyInfo.cs b/TBF/Properties/AssemblyInfo.cs
index cea1e0a91..7c92a0b69 100644
--- a/TBF/Properties/AssemblyInfo.cs
+++ b/TBF/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("2.18.962.0")]
-[assembly: AssemblyFileVersion("2.18.962.0")]
+[assembly: AssemblyVersion("2.18.966.0")]
+[assembly: AssemblyFileVersion("2.18.966.0")]