diff --git a/Assets/AnyRPG/Engine/Core/System/Prefabs/UI/Window/Contents/NameChangePanel.prefab b/Assets/AnyRPG/Engine/Core/System/Prefabs/UI/Window/Contents/NameChangePanel.prefab
index a012fc666..82d362693 100644
--- a/Assets/AnyRPG/Engine/Core/System/Prefabs/UI/Window/Contents/NameChangePanel.prefab
+++ b/Assets/AnyRPG/Engine/Core/System/Prefabs/UI/Window/Contents/NameChangePanel.prefab
@@ -621,7 +621,18 @@ MonoBehaviour:
   m_CharacterLimit: 0
   m_OnEndEdit:
     m_PersistentCalls:
-      m_Calls: []
+      m_Calls:
+      - m_Target: {fileID: 8132367837187297696}
+        m_MethodName: HandleEndEdit
+        m_Mode: 1
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
   m_OnSubmit:
     m_PersistentCalls:
       m_Calls: []
diff --git a/Assets/AnyRPG/Engine/Core/System/Scripts/Characters/BaseClasses/HighlightController.cs b/Assets/AnyRPG/Engine/Core/System/Scripts/Characters/BaseClasses/HighlightController.cs
index 41c7ad613..8543dd4b0 100644
--- a/Assets/AnyRPG/Engine/Core/System/Scripts/Characters/BaseClasses/HighlightController.cs
+++ b/Assets/AnyRPG/Engine/Core/System/Scripts/Characters/BaseClasses/HighlightController.cs
@@ -72,6 +72,10 @@ public void HandleClearTarget() {
 
         public void SetMaterial(Color materialColor) {
             //Debug.Log("FocusTargettingController.SetMaterial(" + (materialColor == null ? "null" : materialColor.ToString()) + ")");
+            if (SystemConfigurationManager.MyInstance == null) {
+                return;
+            }
+
             /*
             foreach (string tmpColor in colorDictionary.Keys) {
                 Debug.Log("Dictionary contains key: " + tmpColor.ToString());