--- old/src/java.desktop/unix/classes/sun/awt/X11/XBaseWindow.java	2017-09-08 12:34:05.514829882 -0700
+++ new/src/java.desktop/unix/classes/sun/awt/X11/XBaseWindow.java	2017-09-08 12:34:05.410831982 -0700
@@ -438,7 +438,7 @@
             if (XPropertyCache.isCachingSupported()) {
                 XPropertyCache.clearCache(window);
             }
-            window = -1;
+            window = 0;
             if( !isDisposed() ) {
                 setDisposed( true );
             }
@@ -726,6 +726,9 @@
     }
 
     public void xSetBounds(int x, int y, int width, int height) {
+        if (isDisposed()) {
+            return;
+        }
         if (getWindow() == 0) {
             insLog.warning("Attempt to resize uncreated window");
             throw new IllegalStateException("Attempt to resize uncreated window");
--- old/src/java.desktop/unix/classes/sun/awt/X11/XDialogPeer.java	2017-09-08 12:34:05.826823583 -0700
+++ new/src/java.desktop/unix/classes/sun/awt/X11/XDialogPeer.java	2017-09-08 12:34:05.730825522 -0700
@@ -59,6 +59,9 @@
     }
 
     public void setVisible(boolean vis) {
+        if (isDisposed()) {
+            return;
+        }
         XToolkit.awtLock();
         try {
             Dialog target = (Dialog)this.target;
--- old/src/java.desktop/unix/classes/sun/awt/X11/XFramePeer.java	2017-09-08 12:34:06.130817445 -0700
+++ new/src/java.desktop/unix/classes/sun/awt/X11/XFramePeer.java	2017-09-08 12:34:06.034819383 -0700
@@ -353,6 +353,9 @@
     }
 
     public void setVisible(boolean vis) {
+        if (isDisposed()) {
+            return;
+        }
         if (vis) {
             setupState(false);
         } else {
--- old/src/java.desktop/unix/classes/sun/awt/X11/XFileDialogPeer.java	2017-09-08 12:34:06.442811144 -0700
+++ new/src/java.desktop/unix/classes/sun/awt/X11/XFileDialogPeer.java	2017-09-08 12:34:06.346813084 -0700
@@ -787,6 +787,9 @@
     // 03/02/2005 b5097243 Pressing 'ESC' on a file dlg does not dispose the dlg on Xtoolkit
     @SuppressWarnings("deprecation")
     public void setVisible(boolean b){
+        if (isDisposed()) {
+            return;
+        }
         if (fileDialog == null) {
             init(target);
         }
--- old/src/java.desktop/unix/classes/sun/awt/X11/GtkFileDialogPeer.java	2017-09-08 12:34:06.758804764 -0700
+++ new/src/java.desktop/unix/classes/sun/awt/X11/GtkFileDialogPeer.java	2017-09-08 12:34:06.662806703 -0700
@@ -110,6 +110,9 @@
 
     @Override
     public void setVisible(boolean b) {
+        if (isDisposed()) {
+            return;
+        }
         XToolkit.awtLock();
         try {
             quit = !b;