diff --git a/src/main/java/com/imsweb/naaccrxml/gui/Standalone.java b/src/main/java/com/imsweb/naaccrxml/gui/Standalone.java
index 873df30a..0899280d 100644
--- a/src/main/java/com/imsweb/naaccrxml/gui/Standalone.java
+++ b/src/main/java/com/imsweb/naaccrxml/gui/Standalone.java
@@ -10,6 +10,7 @@
 import java.awt.Dimension;
 import java.awt.FlowLayout;
 import java.awt.Font;
+import java.awt.IllegalComponentStateException;
 import java.awt.Insets;
 import java.awt.Point;
 import java.awt.Toolkit;
@@ -134,7 +135,7 @@ public Standalone() {
         this.getContentPane().add(_centerPnl, BorderLayout.CENTER);
 
         Thread.setDefaultUncaughtExceptionHandler((t, e) -> SwingUtilities.invokeLater(() -> {
-            boolean isLocationException = e instanceof IllegalStateException; // https://bugs.openjdk.java.net/browse/JDK-8179665
+            boolean isLocationException = e instanceof IllegalComponentStateException; // https://bugs.openjdk.java.net/browse/JDK-8179665
             if (!isLocationException) {
                 String msg = "An unexpected error happened, it is recommended to close the application.\n\n   Error: " + (e.getMessage() == null ? "null access" : e.getMessage());
                 JOptionPane.showMessageDialog(Standalone.this, msg, "Error", JOptionPane.ERROR_MESSAGE);
@@ -233,7 +234,7 @@ else if ("menu-about".equals(cmd)) {
             SwingUtilities.invokeLater(() -> dlg.setVisible(true));
         }
     }
-    
+
     public static JLabel createItalicLabel(String text) {
         JLabel lbl = new JLabel(text);
         lbl.setFont(lbl.getFont().deriveFont(Font.ITALIC));