Hate it when after a fight npc walks over your spell or fire pit and aggros you. It happened to me a lot in act 2's final fight at moonlight towers when Jaheira basically walked over an electric pool after a lenghty fight at the ground fall. It happened another time later.
Maybe make them invulnerable after a fight for a while until they reach their destination waiting for you?
