diff --git a/src/java/com/threerings/crowd/server/CrowdServer.java b/src/java/com/threerings/crowd/server/CrowdServer.java
index 5e4fcd046..ac1a226e3 100644
--- a/src/java/com/threerings/crowd/server/CrowdServer.java
+++ b/src/java/com/threerings/crowd/server/CrowdServer.java
@@ -1,5 +1,5 @@
 //
-// $Id: CrowdServer.java,v 1.20 2004/08/27 02:12:34 mdb Exp $
+// $Id$
 //
 // Narya library - tools for developing networked games
 // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
@@ -108,7 +108,13 @@ public class CrowdServer extends PresentsServer
      */
     public static BodyObject lookupBody (Name username)
     {
-        return (BodyObject)clmgr.getClientObject(username);
+        BodyObject bobj = (BodyObject)clmgr.getClientObject(username);
+        // TEMP until we figure some things out
+        if (bobj.getClass().getName().indexOf("AuthUserObject") != -1) {
+            return null;
+        }
+        // END TEMP
+        return bobj;
     }
 
     public static void main (String[] args)
diff --git a/src/java/com/threerings/presents/server/ClientManager.java b/src/java/com/threerings/presents/server/ClientManager.java
index 00e92ebbe..67846fa3b 100644
--- a/src/java/com/threerings/presents/server/ClientManager.java
+++ b/src/java/com/threerings/presents/server/ClientManager.java
@@ -1,5 +1,5 @@
 //
-// $Id: ClientManager.java,v 1.39 2004/09/15 18:21:26 mdb Exp $
+// $Id$
 //
 // Narya library - tools for developing networked games
 // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
@@ -239,6 +239,15 @@ public class ClientManager
     protected synchronized void mapClientObject (
         Name username, ClientObject clobj)
     {
+        // TEMP until we figure some things out
+        if (clobj.getClass().getName().indexOf("YoUserObject") == -1 &&
+            !username.toString().startsWith("! ")) {
+            String errmsg = "Mapping non-YoUserObject with unmassaged name! " +
+                "[username=" + username + "].";
+            Log.logStackTrace(new Exception(errmsg));
+        }
+        // END TEMP
+
         // stuff the object into the mapping table
         _objmap.put(username, clobj);