1 files changed, 5 insertions, 5 deletions
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VAbstractPaintableWidget.java b/src/com/vaadin/terminal/gwt/client/ui/VAbstractPaintableWidget.java
index efe6896e9b..355516ccd1 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VAbstractPaintableWidget.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VAbstractPaintableWidget.java
@@ -94,15 +94,15 @@ public abstract class VAbstractPaintableWidget implements VPaintableWidget {
         VPaintableMap paintableMap = VPaintableMap.get(getConnection());
 
         Widget w = getWidgetForPaintable();
-        while (w != null) {
+        while (true) {
             w = w.getParent();
+            if (w == null) {
+                return null;
+            }
             if (paintableMap.isPaintable(w)) {
-                return (VPaintableWidgetContainer) paintableMap
-                        .getPaintable(w);
+                return (VPaintableWidgetContainer) paintableMap.getPaintable(w);
             }
         }
-
-        return null;
     }
 
     protected static boolean isRealUpdate(UIDL uidl) {