diff --git a/UAssetAPI b/UAssetAPI
index 515221b..c2be73a 160000
--- a/UAssetAPI
+++ b/UAssetAPI
@@ -1 +1 @@
-Subproject commit 515221b64eba5a516d7ca72339bfc45c38ba8d0f
+Subproject commit c2be73a0c95b340cbd5c10346bde0e35e56f2da2
diff --git a/UAssetGUI/Form1.cs b/UAssetGUI/Form1.cs
index fcca600..cca7674 100644
--- a/UAssetGUI/Form1.cs
+++ b/UAssetGUI/Form1.cs
@@ -1332,7 +1332,7 @@ public void UpdateModeFromSelectedNode(TreeNode e)
 
         private void treeView1_BeforeSelect(object sender, TreeViewCancelEventArgs e)
         {
-            if (tableEditor.dirtySinceLastLoad)
+            if (tableEditor != null && tableEditor.dirtySinceLastLoad)
             {
                 // force refresh before tabbing out if we need to finalize changes before serialization (typically, when null entries exist to get rid of)
                 // we don't just do this every time for performance reasons