diff --git a/Server/Gumps/Gump.cs b/Server/Gumps/Gump.cs
index 568f4bd14..3e6ece6a4 100644
--- a/Server/Gumps/Gump.cs
+++ b/Server/Gumps/Gump.cs
@@ -330,6 +330,9 @@ namespace Server.Gumps
 
 		public void Remove( GumpEntry g )
 		{
+			if (g == null || !m_Entries.Contains(g))
+				return;
+
 			Invalidate();
 			m_Entries.Remove( g );
 			g.Parent = null;
diff --git a/Server/Gumps/GumpEntry.cs b/Server/Gumps/GumpEntry.cs
index fedd8736a..8e58d8329 100644
--- a/Server/Gumps/GumpEntry.cs
+++ b/Server/Gumps/GumpEntry.cs
@@ -70,24 +70,19 @@ namespace Server.Gumps
 			}
 		}
 
-		public Gump Parent
-		{
-			get
-			{
+		public Gump Parent {
+			get {
 				return m_Parent;
 			}
-			set
-			{
-				if ( m_Parent != value )
-				{
-					if ( m_Parent != null )
-					{
-						m_Parent.Remove( this );
-					}
+			set {
+				if (m_Parent != value) {
+					if (m_Parent != null)
+						m_Parent.Remove(this);
 
 					m_Parent = value;
 
-					m_Parent.Add( this );
+					if (m_Parent != null)
+						m_Parent.Add(this);
 				}
 			}
 		}