Index: src/test/api/java/common/javax/swing/JEditorPaneTest.java =================================================================== --- src/test/api/java/common/javax/swing/JEditorPaneTest.java (revision 490282) +++ src/test/api/java/common/javax/swing/JEditorPaneTest.java (working copy) @@ -374,6 +374,13 @@ "javax.swing.JEditorPaneTest$SimpleEditorKit"); assertEquals("javax.swing.JEditorPaneTest$SimpleEditorKit", JEditorPane .getEditorKitClassNameForContentType("text/test1")); + + try { + JEditorPane.registerEditorKitForContentType(null, null); + fail("NPE should be thrown"); + } catch (NullPointerException npe) { + // PASSED + } } public void testRegisterEditorKitForContentTypeStringStringClassLoader() {