diff --git a/Step.Database/Controllers/NcToolManagerController.cs b/Step.Database/Controllers/NcToolManagerController.cs
index f8ebeafc..46042c3a 100644
--- a/Step.Database/Controllers/NcToolManagerController.cs
+++ b/Step.Database/Controllers/NcToolManagerController.cs
@@ -156,12 +156,12 @@ namespace Step.Database.Controllers
             return positions;
         }
 
-        public List<NcOffsetModel> GetOffsets()
-        {
-            List<NcOffsetModel> offsets = dbCtx.Offsets.ToList();
+        //public List<NcOffsetModel> GetOffsets()
+        //{
+        //    List<NcOffsetModel> offsets = dbCtx.Offsets.ToList();
 
-            return offsets;
-        }
+        //    return offsets;
+        //}
 
         public List<DTONcShankModel> GetMountedShanks(int magazineId)
         {
@@ -197,16 +197,15 @@ namespace Step.Database.Controllers
         public NcToolModel UpdateTool(int toolId, DTONewNcToolModel dtoTool)
         {
             NcToolModel tool = FindTool(toolId);
-            //// Update db model
-            //tool.FamilyId = obj.FamilyId;
-            //tool.Type = obj.Type;
-            //tool.OffsetLength = obj.OffsetLength;
-            //tool.ResidualLife = obj.ResidualLife;
-            //tool.ResidualRevive = obj.ResidualRevive;
-            //tool.OffsetId1 = obj.OffsetId1;
-            //tool.OffsetId2 = obj.OffsetId2;
-            //tool.OffsetId3 = obj.OffsetId3;
-            tool = (NcToolModel)dtoTool;
+            // Update db model
+            tool.FamilyId = dtoTool.FamilyId;
+            tool.Type = dtoTool.Type;
+            tool.OffsetLength = dtoTool.OffsetLength;
+            tool.ResidualLife = dtoTool.ResidualLife;
+            tool.ResidualRevive = dtoTool.ResidualRevive;
+            tool.OffsetId1 = dtoTool.OffsetId1;
+            tool.OffsetId2 = dtoTool.OffsetId2;
+            tool.OffsetId3 = dtoTool.OffsetId3;
             // Save
             dbCtx.SaveChanges();
 
diff --git a/Step.Model/DTOModels/ToolModels/DTONcToolModel.cs b/Step.Model/DTOModels/ToolModels/DTONcToolModel.cs
index 00f4d48d..fec24d37 100644
--- a/Step.Model/DTOModels/ToolModels/DTONcToolModel.cs
+++ b/Step.Model/DTOModels/ToolModels/DTONcToolModel.cs
@@ -30,7 +30,7 @@ namespace Step.Model.DTOModels.ToolModels
             return new DTONcTool()
             {
                 FamilyId = obj.FamilyId,
-                ShankId = obj.ShankId.Value,
+                ShankId = obj.ShankId == null ? 0 : obj.ShankId.Value,
                 Type = obj.Type,
                 OffsetLength = obj.OffsetLength,
                 ResidualLife = obj.ResidualLife,
@@ -68,7 +68,7 @@ namespace Step.Model.DTOModels.ToolModels
             {
                 Id = obj.ToolId,
                 FamilyId = obj.FamilyId,
-                ShankId = obj.ShankId.Value,
+                ShankId = obj.ShankId == null ? 0 : obj.ShankId.Value,
                 Type = obj.Type,
                 OffsetLength = obj.OffsetLength,
                 ResidualLife = obj.ResidualLife,
@@ -104,7 +104,7 @@ namespace Step.Model.DTOModels.ToolModels
             return new DTONewNcToolModel()
             {
                 FamilyId = obj.FamilyId,
-                ShankId = obj.ShankId.Value,
+                ShankId = obj.ShankId == null ? 0 : obj.ShankId.Value,
                 Type = obj.Type,
                 OffsetLength = obj.OffsetLength,
                 ResidualLife = obj.ResidualLife,
diff --git a/Step/Controllers/WebApi/NcToolManagerController.cs b/Step/Controllers/WebApi/NcToolManagerController.cs
index 57d6f6b9..08be6cf3 100644
--- a/Step/Controllers/WebApi/NcToolManagerController.cs
+++ b/Step/Controllers/WebApi/NcToolManagerController.cs
@@ -90,6 +90,13 @@ namespace Step.Controllers.WebApi
                 if (tool == null)
                     return NotFound();
 
+                if(tool.FamilyId != dtoTool.FamilyId)
+                {
+                    // Check if family exists
+                    NcFamilyModel fam = toolsManager.FindFamily(dtoTool.FamilyId);
+                    if (fam == null)
+                        return BadRequest(API_ERROR_KEYS.INCORRECT_PARAMETERS);
+                }
 
                 using (NcHandler ncHandler = new NcHandler())
                 {