diff --git a/src/java/com/threerings/presents/dobj/DObject.java b/src/java/com/threerings/presents/dobj/DObject.java index 108088bc7..7ae3dd595 100644 --- a/src/java/com/threerings/presents/dobj/DObject.java +++ b/src/java/com/threerings/presents/dobj/DObject.java @@ -651,7 +651,12 @@ public class DObject } } - // append our attribute to the end of the list + // if we were trying to clear out an attribute but didn't find it, then stop here + if (attr == null) { + return; + } + + // otherwise append our attribute to the end of the list _locattrs = ArrayUtil.append(_locattrs, attr); }