diff --git a/CMS_CORE_Library/Siemens/Nc_Siemens.cs b/CMS_CORE_Library/Siemens/Nc_Siemens.cs
index 013e4fe..8659339 100644
--- a/CMS_CORE_Library/Siemens/Nc_Siemens.cs
+++ b/CMS_CORE_Library/Siemens/Nc_Siemens.cs
@@ -1158,10 +1158,13 @@ namespace CMS_CORE_Library.Siemens
                     {
                         // Read selected edge
                         Item activeEdgeId = new Item { Path = "/Channel/State/actDNumber[u" + readValues[headOffset] + ",1]" }; // OffsetId
-                        DataSvc dataSvc = new DataSvc();
-                        dataSvc.Read(activeEdgeId);
+                        if (activeEdgeId != null)
+                        {
+                            DataSvc dataSvc = new DataSvc();
+                            dataSvc.Read(activeEdgeId);
+                        }
 
-                        if (Convert.ToInt32(activeEdgeId.Value) != 0)
+                        if ( activeEdgeId != null && Convert.ToInt32(activeEdgeId.Value) != 0)
                         {
                             // Find edge
                             var edge = tool.EdgesData
@@ -2397,8 +2400,8 @@ namespace CMS_CORE_Library.Siemens
                     new Item { Path = "/Channel/State/actTNumber[u" + processId + ",1]" }, // ActiveToolId
                     new Item { Path = "/Channel/State/actDNumber[u" + processId + ",1]" }, // OffsetId
                     new Item { Path = "/Channel/State/actFrameIndex[u" + processId + "]" }, // Origin
-                    new Item { Path = "DB21.DBB4"}, // Work override
-                    new Item { Path = "DB21.DBB5"}, // Rapid override,
+                    new Item { Path = "DB2"+processId+".DBB4"}, // Work override
+                    new Item { Path = "DB2"+processId+".DBB5"}, // Rapid override,
                     new Item { Path = "/Channel/State/actFeedRateIpo[u" + processId + ", 1]"},
                     new Item { Path = "/Nck/Configuration/numCuttEdgeParams[1]"}, // Cutt Edge Params                    
                 };