From e079f33b1e1df4ec81ec26f5207766cdb928656e Mon Sep 17 00:00:00 2001
From: Matti Tahvonen <matti.tahvonen@itmill.com>
Date: Mon, 15 Mar 2010 08:37:58 +0000
Subject: [PATCH] #4333

svn changeset:11858/svn branch:6.3
---
 src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java b/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
index a1c909c7ef..fb95cc86d3 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
@@ -1678,7 +1678,9 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler,
         @Override
         protected void onDetach() {
             super.onDetach();
-            client.getContextMenu().ensureHidden(this);
+            if (client != null) {
+                client.getContextMenu().ensureHidden(this);
+            }
         }
 
         class VisibleColumnAction extends Action {
-- 
2.39.5