diff --git a/MainWindow/MainWindowVM.vb b/MainWindow/MainWindowVM.vb
index a58a66c..b52bf13 100644
--- a/MainWindow/MainWindowVM.vb
+++ b/MainWindow/MainWindowVM.vb
@@ -370,8 +370,8 @@ Public Class MainWindowVM
          EgtSetLockId(sLockId)
       End If
       ' Recupero livello e opzioni della chiave
-      Dim bKey As Boolean = EgtGetKeyLevel(3279, 3102, 1, IniFile.m_nKeyLevel) And
-                            EgtGetKeyOptions(3279, 3102, 1, IniFile.m_nKeyOptions)
+      Dim bKey As Boolean = EgtGetKeyLevel(3279, 3103, 1, IniFile.m_nKeyLevel) And
+                            EgtGetKeyOptions(3279, 3103, 1, IniFile.m_nKeyOptions)
       ' Leggo e imposto livello utilizzatore
       IniFile.m_nUserLevel = Math.Min(IniFile.m_nKeyLevel, GetPrivateProfileInt(S_GENERAL, K_USERLEVEL, 1))
       ' Imposto abilitazione lavorazioni avanzate
diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb
index 15e0f27..86d2c26 100644
--- a/My Project/AssemblyInfo.vb	
+++ b/My Project/AssemblyInfo.vb	
@@ -70,6 +70,6 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("3.1.2.1")>
-<Assembly: AssemblyFileVersion("3.1.2.1")>
+<Assembly: AssemblyVersion("3.1.3.1")>
+<Assembly: AssemblyFileVersion("3.1.3.1")>
 
diff --git a/OptionPanel/MachiningOptionPanel/OperationsListExpander/OperationsListExpanderVM.vb b/OptionPanel/MachiningOptionPanel/OperationsListExpander/OperationsListExpanderVM.vb
index f4484be..6cf1c4a 100644
--- a/OptionPanel/MachiningOptionPanel/OperationsListExpander/OperationsListExpanderVM.vb
+++ b/OptionPanel/MachiningOptionPanel/OperationsListExpander/OperationsListExpanderVM.vb
@@ -1302,10 +1302,12 @@ Public Class OperationsListExpanderVM
       ' Annullo creazione nuova lavorazione
       If m_NewMachining Then EndNewMachining(GDB_ID.NULL)
       ' Disabilito visualizzazione utensile
-      Map.refMachiningParameterExpanderVM.SetToolLook(MCH_LOOK.NONE)
-      Map.refMachiningParameterExpanderVM.SetSlider_IsEnable(False)
-      Map.refMachiningParameterExpanderVM.ResetSliderValue()
-      EgtRemovePreviewMachiningTool()
+      If Not IsNothing(Map.refMachiningParameterExpanderVM) Then
+         Map.refMachiningParameterExpanderVM.SetToolLook(MCH_LOOK.NONE)
+         Map.refMachiningParameterExpanderVM.SetSlider_IsEnable(False)
+         Map.refMachiningParameterExpanderVM.ResetSliderValue()
+         EgtRemovePreviewMachiningTool()
+      End If
       ' Deseleziono le operazioni correnti per eliminare il mark
       For Each Operation In OperationList
          If Operation.IsSelected Then