diff --git a/src/main/java/com/threerings/crowd/data/BodyObject.java b/src/main/java/com/threerings/crowd/data/BodyObject.java
index a45275ed0..3a0c17568 100644
--- a/src/main/java/com/threerings/crowd/data/BodyObject.java
+++ b/src/main/java/com/threerings/crowd/data/BodyObject.java
@@ -134,6 +134,8 @@ public class BodyObject extends ClientObject
      * Return the {@link ClientObject} that represent our driving user's connection. This is
      * the reverse operation of {@link BodyLocator#forClient} and should match it. The default
      * implementation assumes the client object and the body object are one and the same.
+     *
+     * Do not return null here once this object is in the wild.
      */
     public ClientObject getClientObject ()
     {
diff --git a/src/main/java/com/threerings/crowd/server/LocationManager.java b/src/main/java/com/threerings/crowd/server/LocationManager.java
index 67fdc8dc5..115556606 100644
--- a/src/main/java/com/threerings/crowd/server/LocationManager.java
+++ b/src/main/java/com/threerings/crowd/server/LocationManager.java
@@ -178,10 +178,7 @@ public class LocationManager
         leaveOccupiedPlace(source);
 
         // then send a forced move notification to the body's client
-        ClientObject clobj = source.getClientObject();
-        if (clobj != null) {
-            LocationSender.forcedMove(clobj, place.placeOid);
-        }
+        LocationSender.forcedMove(source.getClientObject(), place.placeOid);
     }
 
     @Inject protected RootDObjectManager _omgr;