1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/itmill/toolkit/tests/TestBench.java b/src/com/itmill/toolkit/tests/TestBench.java
index 6de3cc7111..d94548becf 100644
--- a/src/com/itmill/toolkit/tests/TestBench.java
+++ b/src/com/itmill/toolkit/tests/TestBench.java
@@ -144,13 +144,13 @@ public class TestBench extends com.itmill.toolkit.Application implements
         bodyLayout.setCaption(null);
 
         Object o = menu.getValue();
-        if (o instanceof Class) {
+        if (o != null && o instanceof Class) {
             Class c = (Class) o;
             String title = c.getName();
             bodyLayout.setCaption(title);
             bodyLayout.addComponent(createTestable(c));
         } else {
-            // NOP node selected
+            // NOP node selected or deselected tree item
         }
     }