diff --git a/Libs/CMS_CORE_Library.dll b/Libs/CMS_CORE_Library.dll
index 38017f5f..9d78636d 100644
Binary files a/Libs/CMS_CORE_Library.dll and b/Libs/CMS_CORE_Library.dll differ
diff --git a/Step.UI/Dialogs/ResetCountersForm.cs b/Step.UI/Dialogs/ResetCountersForm.cs
index b53879c7..994aa4ee 100644
--- a/Step.UI/Dialogs/ResetCountersForm.cs
+++ b/Step.UI/Dialogs/ResetCountersForm.cs
@@ -90,6 +90,7 @@ namespace Step.UI
             if (!Nc.ResetMachineWTime(val))
             {
                 MessageBox.Show("Error While Resetting time", this.Text, MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return;
             }
             
             MessageBox.Show("Time resetted", this.Text, MessageBoxButtons.OK, MessageBoxIcon.Information);