1 files changed, 5 insertions, 2 deletions

diff --git a/OpenSim/Region/ScriptEngine/XEngine/Script/BuiltIn_Commands_BaseClass.cs b/OpenSim/Region/ScriptEngine/XEngine/Script/BuiltIn_Commands_BaseClass.cs
index ebe4fc5..71fc0b6 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/Script/BuiltIn_Commands_BaseClass.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/Script/BuiltIn_Commands_BaseClass.cs
@@ -81,10 +81,13 @@ namespace OpenSim.Region.ScriptEngine.XEngine.Script
 
         public Dictionary<string, object> GetVars()
         {
-            m_Fields.Clear();
-
             Dictionary<string, object> vars = new Dictionary<string, object>();
 
+            if(m_Fields == null)
+                return vars;
+
+            m_Fields.Clear();
+
             Type t = GetType();
 
             FieldInfo[] fields = t.GetFields(BindingFlags.NonPublic |