diff --git a/Scripts/Items/Addons/BaseAddon.cs b/Scripts/Items/Addons/BaseAddon.cs
index 4ef870f0e..136fb9183 100644
--- a/Scripts/Items/Addons/BaseAddon.cs
+++ b/Scripts/Items/Addons/BaseAddon.cs
@@ -167,12 +167,9 @@ namespace Server.Items
 
 		public static bool CheckHouse( Mobile from, Point3D p, Map map, int height, ref List<BaseHouse> list )
 		{
-			if ( from == null || from.AccessLevel >= AccessLevel.GameMaster )
-				return true;
-
 			BaseHouse house = BaseHouse.FindHouseAt( p, map, height );
 
-			if ( house == null || !house.IsOwner( from ) )
+			if ( from == null || house == null || !house.IsOwner( from ) )
 				return false;
 
 			if ( !list.Contains( house ) )
diff --git a/Scripts/Items/Addons/BaseAddonDeed.cs b/Scripts/Items/Addons/BaseAddonDeed.cs
index ea44581f5..d32bb5847 100644
--- a/Scripts/Items/Addons/BaseAddonDeed.cs
+++ b/Scripts/Items/Addons/BaseAddonDeed.cs
@@ -94,11 +94,8 @@ namespace Server.Items
 					{
 						m_Deed.Delete();
 
-						if ( houses != null )
-						{
-							foreach ( BaseHouse h in houses )
-								h.Addons.Add( addon );
-						}
+						foreach ( BaseHouse h in houses )
+							h.Addons.Add( addon );
 					}
 					else
 					{