diff --git a/platform/platform-impl/src/com/intellij/ui/content/impl/TabbedContentImpl.java b/platform/platform-impl/src/com/intellij/ui/content/impl/TabbedContentImpl.java
index 3dfb02a15344..a287b73481ca 100644
--- a/platform/platform-impl/src/com/intellij/ui/content/impl/TabbedContentImpl.java
+++ b/platform/platform-impl/src/com/intellij/ui/content/impl/TabbedContentImpl.java
@@ -51,9 +51,12 @@ public class TabbedContentImpl extends ContentImpl implements TabbedContent {
 
   @Override
   public void setComponent(JComponent component) {
-    Container parent = getComponent().getParent();
-    parent.remove(getComponent());
-    parent.add(component);
+    JComponent currentComponent = getComponent();
+    Container parent = currentComponent == null ? null : currentComponent.getParent();
+    if (parent != null) {
+      parent.remove(currentComponent);
+      parent.add(component);
+    }
 
     super.setComponent(component);
   }