Index: src/test/api/java.injected/javax/swing/text/html/FormViewTest.java =================================================================== --- src/test/api/java.injected/javax/swing/text/html/FormViewTest.java (revision 545092) +++ src/test/api/java.injected/javax/swing/text/html/FormViewTest.java (working copy) @@ -976,10 +976,10 @@ attrs.addAttributes(elem.getAttributes()); attrs.removeAttribute(StyleConstants.ModelAttribute); doc.setCharacterAttributes(offset, 1, attrs, true); - + + createFormView(id); assertNull(elem.getAttributes().getAttribute(StyleConstants .ModelAttribute)); - createFormView(id); assertNotNull(formView.createComponent()); assertNull(elem.getAttributes().getAttribute(StyleConstants .ModelAttribute)); Index: src/main/java/common/javax/swing/text/ComponentView.java =================================================================== --- src/main/java/common/javax/swing/text/ComponentView.java (revision 545092) +++ src/main/java/common/javax/swing/text/ComponentView.java (working copy) @@ -170,7 +170,10 @@ } final Container container = getContainer(); if (container != null) { - container.add(component); + if (component != null) { + container.add(component); + } + if (container.getLayout() == null) { container.setLayout(new ComponentViewLayout()); }