diff --git a/src/java/com/threerings/parlor/server/TableManager.java b/src/java/com/threerings/parlor/server/TableManager.java index ebe1bf08..c6e1214b 100644 --- a/src/java/com/threerings/parlor/server/TableManager.java +++ b/src/java/com/threerings/parlor/server/TableManager.java @@ -86,11 +86,15 @@ public class TableManager */ public void shutdown () { - CrowdServer.invmgr.clearDispatcher(_tlobj.getTableService()); - _tlobj.setTableService(null); + if (_tlobj != null) { + CrowdServer.invmgr.clearDispatcher(_tlobj.getTableService()); + _tlobj.setTableService(null); + } if (_dobj instanceof PlaceObject) { _dobj.removeListener(this); } + _tlobj = null; + _dobj = null; } /**