#4333

svn changeset:11858/svn branch:6.3

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java b/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
index a1c909c7ef91df79e6aab5183ab0cb7cf3cc46ca..fb95cc86d355da10113fdd2fb21488c9c6ac3a88 100644 (file)
--- 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 {