diff options
| -rw-r--r-- | client/src/com/vaadin/client/ui/VTree.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/client/src/com/vaadin/client/ui/VTree.java b/client/src/com/vaadin/client/ui/VTree.java index 846b16d0cb..719b2b91b0 100644 --- a/client/src/com/vaadin/client/ui/VTree.java +++ b/client/src/com/vaadin/client/ui/VTree.java @@ -707,7 +707,7 @@ public class VTree extends FocusElementPanel implements VHasDropHandler, final int type = DOM.eventGetType(event); final Element target = DOM.eventGetTarget(event); - if (type == Event.ONLOAD && target == icon.getElement()) { + if (type == Event.ONLOAD && icon != null && target == icon.getElement()) { iconLoaded.trigger(); } |