diff --git a/Scripts/Mobiles/PlayerMobile.cs b/Scripts/Mobiles/PlayerMobile.cs
index 2bc4e8fcf..d7d791bc5 100644
--- a/Scripts/Mobiles/PlayerMobile.cs
+++ b/Scripts/Mobiles/PlayerMobile.cs
@@ -1492,12 +1492,15 @@ namespace Server.Mobiles
 			{
 				if ( Alive && Core.Expansion >= Expansion.AOS )
 				{
-					if ( from.Party == null && this.Party == null ) {
+					Party theirParty = from.Party as Party;
+					Party ourParty = this.Party as Party;
+
+					if ( theirParty == null && ourParty == null ) {
 						list.Add( new AddToPartyEntry( from, this ) );
-					} else if ( from.Party != null && ((Party)(from.Party)).Leader == from ) {
-						if ( this.Party == null ) {
+					} else if ( theirParty != null && theirParty.Leader == from ) {
+						if ( ourParty == null ) {
 							list.Add( new AddToPartyEntry( from, this ) );
-						} else if ( this.Party == from.Party ) {
+						} else if ( ourParty == theirParty ) {
 							list.Add( new RemoveFromPartyEntry( from, this ) );
 						}
 					}