Npc difficulties returning to Revive me Merged

I am finding Npc revivals to be frequently buggy. Sometimes when I die in an enclosed area, the npc seems to phase out through the wall and have to travel back around to a door to reach me, sometimes returning to the same distance several times. I'm not sure if they're teleporting back to that spot or if the pathing is getting confused and they're having to circle multiple times to find the door. There were grenadiers throwing grenades during some of those instances, I wondered if there was some knock back effect involved. I also had a death on the second floor of an infestation structure, after killing a heart on a 1 block path, and my npc, who was on the ground next to the structure, got caught in a loop running towards the stairs, then back away from the building. After a dozen loops I just respawned myself.