diff --git a/Source/Core/ZDoom/ZDTextParser.cs b/Source/Core/ZDoom/ZDTextParser.cs
index 4224074d5ef868719f69dd476616a5e1311b4b7b..168c2d154d6bdb4406828f6df5d186746fb8616d 100644
--- a/Source/Core/ZDoom/ZDTextParser.cs
+++ b/Source/Core/ZDoom/ZDTextParser.cs
@@ -704,7 +704,11 @@ namespace CodeImp.DoomBuilder.ZDoom
 				errorsource = Path.Combine(datalocation.location, sourcename);
 			}
 			
-			if(sourcelumpindex != -1) errorsource += ":" + sourcelumpindex; //mxd
+			if(sourcelumpindex != -1) //mxd
+			{
+				errorsource += ":" + sourcelumpindex;
+				shorterrorsource += ":" + sourcelumpindex;
+			}
 		}
 
 		//mxd. This adds a warning to the ErrorLogger
diff --git a/Source/Plugins/BuilderModes/ClassicModes/ThingsMode.cs b/Source/Plugins/BuilderModes/ClassicModes/ThingsMode.cs
index 35170cd00d907c1b61d4bbf63d977285f08a262e..f413db0c1445acd8fc0bbc719d82bfb0faf3a89e 100644
--- a/Source/Plugins/BuilderModes/ClassicModes/ThingsMode.cs
+++ b/Source/Plugins/BuilderModes/ClassicModes/ThingsMode.cs
@@ -233,7 +233,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
 				renderer.PlotVerticesSet(General.Map.Map.Vertices);
 
 				for(int i = 0; i < Thing.NUM_ARGS; i++) BuilderPlug.PlotAssociations(renderer, association[i], eventlines);
-				if((highlighted != null) && !highlighted.IsDisposed) BuilderPlug.PlotReverseAssociations(renderer, highlightasso, eventlines);
+				if(highlighted != null && !highlighted.IsDisposed) BuilderPlug.PlotReverseAssociations(renderer, highlightasso, eventlines);
 				
 				renderer.Finish();
 			}
@@ -246,7 +246,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
 				renderer.RenderThingSet(General.Map.ThingsFilter.VisibleThings, alpha);
 				for(int i = 0; i < Thing.NUM_ARGS; i++) BuilderPlug.RenderAssociations(renderer, association[i], eventlines);
 				
-				if((highlighted != null) && !highlighted.IsDisposed)
+				if(highlighted != null && !highlighted.IsDisposed)
 				{
 					renderer.RenderThing(highlighted, General.Colors.Highlight, alpha);
 					BuilderPlug.RenderReverseAssociations(renderer, highlightasso, eventlines); //mxd
@@ -259,14 +259,16 @@ namespace CodeImp.DoomBuilder.BuilderModes
 				if(BuilderPlug.Me.ShowLightRadii)
 				{
 					eventlines.AddRange(dynamiclightshapes);
-					if(highlighted != null) eventlines.AddRange(GetDynamicLightShapes(new List<Thing> { highlighted } ));
+					if(highlighted != null && !highlighted.IsDisposed)
+						eventlines.AddRange(GetDynamicLightShapes(new List<Thing> { highlighted } ));
 				}
 
 				//mxd. Ambient sound radii
 				if(BuilderPlug.Me.ShowSoundRadii)
 				{
 					eventlines.AddRange(ambientsoundshapes);
-					if(highlighted != null) eventlines.AddRange(GetAmbientSoundShapes(new List<Thing> { highlighted }));
+					if(highlighted != null && !highlighted.IsDisposed)
+						eventlines.AddRange(GetAmbientSoundShapes(new List<Thing> { highlighted }));
 				}
 
 				//mxd
diff --git a/Source/Plugins/BuilderModes/Interface/MenusForm.Designer.cs b/Source/Plugins/BuilderModes/Interface/MenusForm.Designer.cs
index a573b653097aff306376e9a3dbc384bcc0613164..57b85c497558037f1827015228d9a1bdc2a36e2e 100644
--- a/Source/Plugins/BuilderModes/Interface/MenusForm.Designer.cs
+++ b/Source/Plugins/BuilderModes/Interface/MenusForm.Designer.cs
@@ -824,7 +824,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
 			this.buttonsoundradii.ImageTransparentColor = System.Drawing.Color.Magenta;
 			this.buttonsoundradii.Name = "buttonsoundradii";
 			this.buttonsoundradii.Size = new System.Drawing.Size(23, 22);
-			this.buttonsoundradii.Text = "Sound Radii";
+			this.buttonsoundradii.Text = "Ambient Sound Radii";
 			this.buttonsoundradii.Click += new System.EventHandler(this.buttonsoundradii_Click);
 			// 
 			// fileMenuStrip
@@ -922,7 +922,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
 			this.itemsoundradii.Image = global::CodeImp.DoomBuilder.BuilderModes.Properties.Resources.SoundRadius;
 			this.itemsoundradii.Name = "itemsoundradii";
 			this.itemsoundradii.Size = new System.Drawing.Size(212, 22);
-			this.itemsoundradii.Text = "Show Sound Radii";
+			this.itemsoundradii.Text = "Show Ambient Sound Radii";
 			this.itemsoundradii.Click += new System.EventHandler(this.buttonsoundradii_Click);
 			// 
 			// MenusForm