diff --git a/Source/Editor/CustomEditors/Values/ValueContainer.cs b/Source/Editor/CustomEditors/Values/ValueContainer.cs
index f8cecb801..b7131630e 100644
--- a/Source/Editor/CustomEditors/Values/ValueContainer.cs
+++ b/Source/Editor/CustomEditors/Values/ValueContainer.cs
@@ -251,6 +251,10 @@ namespace FlaxEditor.CustomEditors
             }
             if (instanceValues._hasReferenceValue)
             {
+                // If the reference value is set for the parent values but it's null object then skip it
+                if (instanceValues._referenceValue == null && !instanceValues.Type.IsValueType)
+                    return;
+
                 _referenceValue = Info.GetValue(instanceValues._referenceValue);
                 _hasReferenceValue = true;
             }
diff --git a/Source/Engine/UI/GUI/Control.cs b/Source/Engine/UI/GUI/Control.cs
index 597cc9e41..96b7bf22b 100644
--- a/Source/Engine/UI/GUI/Control.cs
+++ b/Source/Engine/UI/GUI/Control.cs
@@ -209,7 +209,6 @@ namespace FlaxEngine.GUI
         public bool Enabled
         {
             get => _isEnabled;
-
             set
             {
                 if (_isEnabled != value)
@@ -255,7 +254,6 @@ namespace FlaxEngine.GUI
         public bool Visible
         {
             get => _isVisible;
-
             set
             {
                 if (_isVisible != value)