1 files changed, 5 insertions, 3 deletions
diff --git a/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/trace/TraceView.java b/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/trace/TraceView.java
index 2da1d3c9d..a96f790b6 100644
--- a/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/trace/TraceView.java
+++ b/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/trace/TraceView.java
@@ -187,9 +187,11 @@ public class TraceView extends ViewPart implements Protocol.ChannelOpenListener
             catch (InterruptedException e) {
                 e.printStackTrace();
             }
-            tab2page.remove(tab);
-            tab.dispose();
-            tab = null;
+            if (tab != null) {
+                tab2page.remove(tab);
+                tab.dispose();
+                tab = null;
+            }
             text = null;
             if (tab2page.isEmpty()) hideTabs();
         }