diff --git a/ChangeLog b/ChangeLog
index c2c4fc33b..d4fc9b823 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+1999-10-26  Adam Fedor  <fedor@gnu.org>
+
+	* Source/NSWindow.m (-dealloc): Remove check for context.
+
 Wed Oct 27  1999  Nicola Pero  <n.pero@mi.flashnet.it>
 
 	Patches by ackyugo@geocities.co.jp fixing bug (horizontal 
diff --git a/Source/NSWindow.m b/Source/NSWindow.m
index f01b1cc6c..2ee67a005 100644
--- a/Source/NSWindow.m
+++ b/Source/NSWindow.m
@@ -232,14 +232,9 @@ static NSMapTable* windowmaps = NULL;
    */
   [context _removeDragTypes: nil fromWindow: [self windowNumber]];
 
-  /* Often, when an app is terminated, an NSWindow is autoreleased after the
-     context, so we forget about this if there is no more context */
-  if (context)
-    {
-      if (gstate)
-	DPSundefineuserobject(context, gstate);
-      DPStermwindow(context, window_num);
-    }
+  if (gstate)
+    DPSundefineuserobject(context, gstate);
+  DPStermwindow(context, window_num);
   NSMapRemove(windowmaps, (void*)window_num);
   [super dealloc];
 }