diff --git a/src/locks/lockfuncs.py b/src/locks/lockfuncs.py
index d16081a0e..630c6adbd 100644
--- a/src/locks/lockfuncs.py
+++ b/src/locks/lockfuncs.py
@@ -157,7 +157,7 @@ def perm_above(accessing_obj, accessed_obj, *args, **kwargs):
     """
     try:
         perm = args[0].lower()
-    except IndexError:
+    except (AttributeError, IndexError):
         return False
 
     if perm in _PERMISSION_HIERARCHY:
diff --git a/src/server/serversession.py b/src/server/serversession.py
index 95b0b3f76..3f08eeb32 100644
--- a/src/server/serversession.py
+++ b/src/server/serversession.py
@@ -240,7 +240,7 @@ class ServerSession(Session):
 
         for funcname, argtuple in data.items():
             # loop through the data, calling available functions.
-            func = OOB_FUNC_MODULE.__dict__.get(funcname, None)
+rc           func = OOB_FUNC_MODULE.__dict__.get(funcname, None)
             if func:
                 try:
                     outdata[funcname] = func(entity, *argtuple[0], **argtuple[1])