From 19b1ef8fc93deccee40c845fab6de9c4d2c6e8b3 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Sat, 7 Mar 2015 15:24:03 +0100
Subject: [PATCH] Fixed an unpuppeting bug for bots

---
 evennia/players/players.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/evennia/players/players.py b/evennia/players/players.py
index 7ef1f90a93..023919d777 100644
--- a/evennia/players/players.py
+++ b/evennia/players/players.py
@@ -317,7 +317,11 @@ class DefaultPlayer(PlayerDB):
             # unpuppeting all objects and disconnecting the user, if any
             # sessions remain (should usually be handled from the
             # deleting command)
-            self.unpuppet_object(session.sessid)
+            try:
+                self.unpuppet_object(session.sessid)
+            except RuntimeError:
+                # no puppet to disconnect from
+                pass
             session.sessionhandler.disconnect(session, reason=_("Player being deleted."))
         self.scripts.stop()
         self.attributes.clear()