From 731fec8cc81c4ff6ca53d404b68a2c1538fd3885 Mon Sep 17 00:00:00 2001
From: pag <gabi.antal88@gmail.com>
Date: Sat, 10 Oct 2015 19:17:50 +0200
Subject: Null pointer Exception in Slot.onBrowserEvent (#16587)

Change-Id: I60f68cf7a9e61980809af253bb4f4a0ab92f1230
---
 client/src/com/vaadin/client/ui/orderedlayout/Slot.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/com/vaadin/client/ui/orderedlayout/Slot.java b/client/src/com/vaadin/client/ui/orderedlayout/Slot.java
index cc4b6a0662..564c15472f 100644
--- a/client/src/com/vaadin/client/ui/orderedlayout/Slot.java
+++ b/client/src/com/vaadin/client/ui/orderedlayout/Slot.java
@@ -772,7 +772,7 @@ public class Slot extends SimplePanel {
     @Override
     public void onBrowserEvent(Event event) {
         super.onBrowserEvent(event);
-        if (DOM.eventGetType(event) == Event.ONLOAD
+        if (DOM.eventGetType(event) == Event.ONLOAD && icon != null
                 && icon.getElement() == DOM.eventGetTarget(event)) {
             if (layout.getLayoutManager() != null) {
                 layout.getLayoutManager().layoutLater();
-- 
cgit v1.2.3