From 3ff9eac86ce9bfb9fc25b7bfbb721fc806e1fa81 Mon Sep 17 00:00:00 2001
From: Tehom <surly.mime@gmail.com>
Date: Wed, 5 Oct 2016 02:46:43 -0400
Subject: [PATCH] Have lockshandler fail gracefully rather than cause a server
 crash

---
 evennia/locks/lockhandler.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/evennia/locks/lockhandler.py b/evennia/locks/lockhandler.py
index 2344c02698..a2ff65bf96 100644
--- a/evennia/locks/lockhandler.py
+++ b/evennia/locks/lockhandler.py
@@ -177,7 +177,10 @@ class LockHandler(object):
             _cache_lockfuncs()
         self.obj = obj
         self.locks = {}
-        self.reset()
+        try:
+            self.reset()
+        except LockException as err:
+            logger.log_trace(err)
 
     def __str__(self):
         return ";".join(self.locks[key][2] for key in sorted(self.locks))