diff --git a/src/as/com/threerings/whirled/client/SceneDirector.as b/src/as/com/threerings/whirled/client/SceneDirector.as
index e0b161a2..9ceea603 100644
--- a/src/as/com/threerings/whirled/client/SceneDirector.as
+++ b/src/as/com/threerings/whirled/client/SceneDirector.as
@@ -215,6 +215,11 @@ public class SceneDirector extends BasicDirector
         clearScene();
 
         // make the pending scene the active scene
+        if (_pendingData == null) {
+            log.warning("Aiya! Scene move succeeded but we have no pending data! " +
+                        "[prevId=" + _previousSceneId + "].");
+            return;
+        }
         _sceneId = _pendingData.sceneId;
         _pendingData = null;