diff --git a/evennia/server/serversession.py b/evennia/server/serversession.py
index 13c6565f8e..33f979056f 100644
--- a/evennia/server/serversession.py
+++ b/evennia/server/serversession.py
@@ -110,7 +110,7 @@ class ServerSession(Session):
         if self.logged_in:
             sessid = self.sessid
             player = self.player
-            player.unpuppet_object(sessid)
+            player.unpuppet_object(sessid, ignore_empty=True)
             uaccount = player
             uaccount.last_login = datetime.now()
             uaccount.save()
diff --git a/evennia/server/sessionhandler.py b/evennia/server/sessionhandler.py
index ad094c7794..4f4949d53d 100644
--- a/evennia/server/sessionhandler.py
+++ b/evennia/server/sessionhandler.py
@@ -456,7 +456,8 @@ class ServerSessionHandler(SessionHandler):
 
         """
         sessions = make_iter(session)
-        text = text and to_str(to_unicode(text), encoding=sessions[0].encoding)
+        session = sessions[0]
+        text = text and to_str(to_unicode(text), encoding=session.encoding)
         multi = not kwargs.pop("_nomulti", None)
         forced_nomulti = kwargs.pop("_forced_nomulti", None)
         # Mode 1 mirrors to all.