diff --git a/src/s_advsound.cpp b/src/s_advsound.cpp
index 5b2e4e7c1..f7a40da9b 100644
--- a/src/s_advsound.cpp
+++ b/src/s_advsound.cpp
@@ -2347,14 +2347,14 @@ class AMusicChanger : public ASectorAction
 {
 	DECLARE_CLASS (AMusicChanger, ASectorAction)
 public:
-	virtual bool TriggerAction (AActor *triggerer, int activationType);
+	virtual bool DoTriggerAction (AActor *triggerer, int activationType);
 	virtual void Tick();
 	virtual void PostBeginPlay();
 };
 
 IMPLEMENT_CLASS(AMusicChanger)
 
-bool AMusicChanger::TriggerAction (AActor *triggerer, int activationType)
+bool AMusicChanger::DoTriggerAction (AActor *triggerer, int activationType)
 {
 	if (activationType & SECSPAC_Enter)
 	{
@@ -2364,7 +2364,7 @@ bool AMusicChanger::TriggerAction (AActor *triggerer, int activationType)
 			reactiontime = 30;
 		}
 	}
-	return Super::TriggerAction (triggerer, activationType);
+	return Super::DoTriggerAction (triggerer, activationType);
 }
  
 void AMusicChanger::Tick()
diff --git a/src/thingdef/thingdef_parse.cpp b/src/thingdef/thingdef_parse.cpp
index 498003b4e..88e6084b6 100644
--- a/src/thingdef/thingdef_parse.cpp
+++ b/src/thingdef/thingdef_parse.cpp
@@ -374,6 +374,8 @@ static void ParseUserVariable (FScanner &sc, PSymbolTable *symt, PClass *cls)
 		FScriptPosition::ErrorCounter++;
 	}
 
+
+
 	FName symname = sc.String;
 	if (sc.CheckToken('['))
 	{
@@ -391,6 +393,15 @@ static void ParseUserVariable (FScanner &sc, PSymbolTable *symt, PClass *cls)
 	}
 	sc.MustGetToken(';');
 
+	// We must ensure that we do not define duplicates, even when they come from a parent table.
+	if (symt->FindSymbol(symname, true) != NULL)
+	{
+		sc.ScriptMessage ("'%s' is already defined in '%s' or one of its ancestors.",
+			symname.GetChars(), cls ? cls->TypeName.GetChars() : "Global");
+		FScriptPosition::ErrorCounter++;
+		return;
+	}
+
 	PSymbolVariable *sym = new PSymbolVariable(symname);
 	sym->offset = cls->Extend(sizeof(int) * (valuetype.Type == VAL_Array ? valuetype.size : 1));
 	sym->ValueType = valuetype;