diff --git a/common/src/main/scala/services/account/AccountPersistenceService.scala b/common/src/main/scala/services/account/AccountPersistenceService.scala
index 98d50227..e0bdf217 100644
--- a/common/src/main/scala/services/account/AccountPersistenceService.scala
+++ b/common/src/main/scala/services/account/AccountPersistenceService.scala
@@ -309,7 +309,7 @@ class PersistenceMonitor(name : String, squadService : ActorRef, taskResolver :
     player.Position = Vector3.Zero
     player.Health = 0
     inZone.GUID(player.VehicleOwned) match {
-      case Some(vehicle : Vehicle) if vehicle.OwnerName.contains(player.Name) =>
+      case Some(vehicle : Vehicle) if vehicle.OwnerName.contains(player.Name) && vehicle.Actor != ActorRef.noSender =>
         vehicle.Actor ! Vehicle.Ownership(None)
       case _ => ;
     }
diff --git a/pslogin/src/main/scala/WorldSessionActor.scala b/pslogin/src/main/scala/WorldSessionActor.scala
index 00700123..ae5f4300 100644
--- a/pslogin/src/main/scala/WorldSessionActor.scala
+++ b/pslogin/src/main/scala/WorldSessionActor.scala
@@ -9324,7 +9324,7 @@ class WorldSessionActor extends Actor
   def HandleDealingDamage(target : PlanetSideGameObject with Vitality, data : ResolvedProjectile) : Unit = {
     val func = data.damage_model.Calculate(data)
     target match {
-      case obj : Player if obj.CanDamage =>
+      case obj : Player if obj.CanDamage && obj.Actor != ActorRef.noSender =>
         if(obj.spectator) {
           player.death_by = -1 // little thing for auto kick
         }
@@ -10199,7 +10199,7 @@ class WorldSessionActor extends Actor
   def LoadZoneCommonTransferActivity() : Unit = {
     if(player.VehicleOwned.nonEmpty && player.VehicleSeated != player.VehicleOwned) {
       continent.GUID(player.VehicleOwned) match {
-        case Some(vehicle : Vehicle) =>
+        case Some(vehicle : Vehicle) if vehicle.Actor != ActorRef.noSender =>
           vehicle.Actor ! Vehicle.Ownership(None)
         case _ => ;
       }