1 files changed, 5 insertions, 2 deletions
diff --git a/java/awt/EventQueue.java b/java/awt/EventQueue.java
index 0b6e03efa..74dbd5fb6 100644
--- a/java/awt/EventQueue.java
+++ b/java/awt/EventQueue.java
@@ -584,8 +584,11 @@ public class EventQueue
                 prev = null;
                 // Tell our EventDispatchThread that it can end
                 // execution.
-                dispatchThread.interrupt();
-                dispatchThread = null;
+                if (dispatchThread != null)
+                  {
+                    dispatchThread.interrupt();
+                    dispatchThread = null;
+                  }
               }
           }
       }