diff --git a/lib/annotations/jdom/org/jdom/annotations.xml b/lib/annotations/jdom/org/jdom/annotations.xml
index 8dfdb34759bf..ce8c20a18e61 100644
--- a/lib/annotations/jdom/org/jdom/annotations.xml
+++ b/lib/annotations/jdom/org/jdom/annotations.xml
@@ -54,6 +54,9 @@
   <item name='org.jdom.Element org.jdom.Attribute getAttribute(java.lang.String)'>
     <annotation name='org.jetbrains.annotations.Nullable'/>
   </item>
+  <item name='org.jdom.Element org.jdom.Element addContent(org.jdom.Element) 0'>
+    <annotation name='org.jetbrains.annotations.NotNull'/>
+  </item>
   <item name='org.jdom.Element org.jdom.Element getChild(java.lang.String)'>
     <annotation name='org.jetbrains.annotations.Nullable'/>
   </item>
diff --git a/platform/lang-impl/src/com/intellij/execution/ui/layout/impl/RunnerLayout.java b/platform/lang-impl/src/com/intellij/execution/ui/layout/impl/RunnerLayout.java
index 908560f8844a..70a2c78df68c 100644
--- a/platform/lang-impl/src/com/intellij/execution/ui/layout/impl/RunnerLayout.java
+++ b/platform/lang-impl/src/com/intellij/execution/ui/layout/impl/RunnerLayout.java
@@ -132,15 +132,15 @@ public class RunnerLayout  {
       if (myLightWeightIds != null && myLightWeightIds.contains(eachState.getID())) {
         continue;
       }
-      parentNode.addContent(XmlSerializer.serialize(eachState));
+
+      Element element = XmlSerializer.serialize(eachState);
+      parentNode.addContent(element == null ? new Element("ViewImpl") : element);
     }
 
     for (TabImpl eachTab : myTabs) {
       if (isUsed(eachTab)) {
         Element element = XmlSerializer.serialize(eachTab);
-        if (element != null) {
-          parentNode.addContent(element);
-        }
+        parentNode.addContent(element == null ? new Element("TabImpl") : element);
       }
     }