diff --git a/ChangeLog b/ChangeLog
index 3888ed53c..1fdcec085 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-01-14  Elijah Newren  <newren gmail com>
+
+	* src/window.c (__window_is_terminal): Don't dereference a NULL
+	string.  Fixes #327013.
+
 2006-01-14  Elijah Newren  <newren gmail com>
 
 	* src/compositor.[ch]: fix compilation when
diff --git a/src/window.c b/src/window.c
index 187891401..0dca7502d 100644
--- a/src/window.c
+++ b/src/window.c
@@ -1717,7 +1717,7 @@ intervening_user_event_occurred (MetaWindow *window)
 gboolean
 __window_is_terminal (MetaWindow *window)
 {
-  if (window == NULL)
+  if (window == NULL || window->res_name == NULL)
     return FALSE;
 
   /* gnome-terminal -- if you couldn't guess */