--- a/test/jdk/javax/swing/plaf/nimbus/AllSwingComponentsBaselineTest.java	Fri Nov 02 15:38:03 2018 -0700
+++ b/test/jdk/javax/swing/plaf/nimbus/AllSwingComponentsBaselineTest.java	Sat Nov 03 09:50:22 2018 +0530
@@ -22,7 +22,8 @@
  */
 
 /* @test
-   @bug 8192888
+   @key headful
+   @bug 8192888 8213261
    @summary Verifies getBaseline causes NPE for Nimbus L&F
    @run main AllSwingComponentsBaselineTest
  */
@@ -58,7 +59,9 @@
             BasicButtonUI bbUI = (BasicButtonUI) UIManager.getUI(b);
             bbUI.getBaseline(b, b.getHeight(), b.getWidth());
         } finally {
-            frame.dispose();
+            if (frame != null) {
+                frame.dispose();
+            }
         }
     }
 }