diff --git a/evennia/__init__.py b/evennia/__init__.py
index bb9c29a594..6858744d42 100644
--- a/evennia/__init__.py
+++ b/evennia/__init__.py
@@ -365,7 +365,6 @@ def set_trace(debugger="auto", term_size=(140, 40)):
         import pdb
         dbg = pdb.Pdb(stdout=sys.__stdout__)
 
-    #
-    # stopped at breakpoint. Use 'n' (next) to continue into the code.
-    #
-    dbg.set_trace()
+    # Start debugger, forcing it up one stack frame (otherwise `set_trace` will start # debugger at
+    # this point, not the actual code location)
+    dbg.set_trace(sys._getframe().f_back)
diff --git a/evennia/locks/lockhandler.py b/evennia/locks/lockhandler.py
index 2338b18667..d7170c54d1 100644
--- a/evennia/locks/lockhandler.py
+++ b/evennia/locks/lockhandler.py
@@ -664,9 +664,9 @@ def validate_lockstring(lockstring):
             if no error was found.
 
     """
-    global _LOCKHANDLER
-    if not _LOCKHANDLER:
-        _LOCKHANDLER = LockHandler(_ObjDummy())
+    global _LOCK_HANDLER
+    if not _LOCK_HANDLER:
+        _LOCK_HANDLER = LockHandler(_ObjDummy())
     return _LOCK_HANDLER.validate(lockstring)