diff --git a/Source/Editor/Windows/Assets/GameplayGlobalsWindow.cs b/Source/Editor/Windows/Assets/GameplayGlobalsWindow.cs
index 40dd51e5e..6899bfac6 100644
--- a/Source/Editor/Windows/Assets/GameplayGlobalsWindow.cs
+++ b/Source/Editor/Windows/Assets/GameplayGlobalsWindow.cs
@@ -494,6 +494,7 @@ namespace FlaxEditor.Windows.Assets
             _undo.Enabled = false;
             _undo.Clear();
             _propertiesEditor.BuildLayoutOnUpdate();
+            UpdateToolstrip();
         }
 
         /// <inheritdoc />
@@ -504,6 +505,7 @@ namespace FlaxEditor.Windows.Assets
             _undo.Enabled = true;
             _undo.Clear();
             _propertiesEditor.BuildLayoutOnUpdate();
+            UpdateToolstrip();
         }
 
         /// <inheritdoc />
diff --git a/Source/Engine/Engine/GameplayGlobals.cpp b/Source/Engine/Engine/GameplayGlobals.cpp
index 83874d5a5..eba975e2b 100644
--- a/Source/Engine/Engine/GameplayGlobals.cpp
+++ b/Source/Engine/Engine/GameplayGlobals.cpp
@@ -221,9 +221,7 @@ Asset::LoadResult GameplayGlobals::load()
     // Get data
     const auto chunk = GetChunk(0);
     if (!chunk || !chunk->IsLoaded())
-    {
         return LoadResult::MissingDataChunk;
-    }
     MemoryReadStream stream(chunk->Get(), chunk->Size());
 
     // Load all variables
@@ -234,15 +232,16 @@ Asset::LoadResult GameplayGlobals::load()
     for (int32 i = 0; i < count; i++)
     {
         stream.ReadString(&name, 71);
-        if (name.IsEmpty())
-        {
-            LOG(Warning, "Empty variable name");
-            return LoadResult::InvalidData;
-        }
         auto& e = Variables[name];
         stream.ReadVariant(&e.DefaultValue);
         e.Value = e.DefaultValue;
     }
+    if (stream.HasError())
+    {
+        // Failed to load data
+        Variables.Clear();
+        return LoadResult::InvalidData;
+    }
 
     return LoadResult::Ok;
 }