diff --git a/Libs/CMS_CORE_Library.dll b/Libs/CMS_CORE_Library.dll
index 6e86f29d..e9148306 100644
Binary files a/Libs/CMS_CORE_Library.dll and b/Libs/CMS_CORE_Library.dll differ
diff --git a/Step.Core/ThreadsFunctions.cs b/Step.Core/ThreadsFunctions.cs
index 7f51642d..035fe165 100644
--- a/Step.Core/ThreadsFunctions.cs
+++ b/Step.Core/ThreadsFunctions.cs
@@ -507,7 +507,7 @@ public static class ThreadsFunctions
                     // Get Data from config and PLC
                     libraryError = ncHandler.GetActiveProgramInfo(out DTOActiveProgramDataModel active);
 
-                    if (libraryError.errorCode != 0)
+                    if (libraryError.IsError())
                         ManageLibraryError(libraryError);
                     else
                         // Send through signalR
@@ -553,6 +553,9 @@ public static class ThreadsFunctions
                 {
                     // Get new data from PLC
                     libraryError = ncHandler.GetUpdatedToolsData(out Dictionary<int, byte> updatedStatus, out Dictionary<int, uint> updatedLives);
+                    if (libraryError.IsError())
+                        ManageLibraryError(libraryError);
+
                     MessageServices.Current.Publish(UPDATE_TOOLS_DATA, null,
                     new DTONewToolDataModel
                     {
@@ -599,6 +602,8 @@ public static class ThreadsFunctions
                 {
                     // Get new data from PLC
                     libraryError = ncHandler.GetNcMagazineStatus(out Dictionary<int, bool> status);
+                    if (libraryError.IsError())
+                        ManageLibraryError(libraryError);
 
                     MessageServices.Current.Publish(NC_MAGAZINE_IS_ACTIVE, null, status);
                 }