diff --git a/evennia/commands/default/player.py b/evennia/commands/default/player.py
index 3041314d1..81d2a35d1 100644
--- a/evennia/commands/default/player.py
+++ b/evennia/commands/default/player.py
@@ -422,7 +422,7 @@ class CmdWho(COMMAND_DEFAULT_CLASS):
                 delta_conn = time.time() - session.conn_time
                 player = session.get_player()
                 puppet = session.get_puppet()
-                location = puppet.location.key if puppet else "None"
+                location = puppet.location.key if puppet and puppet.location else "None"
                 table.add_row([utils.crop(player.name, width=25),
                                utils.time_format(delta_conn, 0),
                                utils.time_format(delta_cmd, 1),