diff --git a/ChangeLog b/ChangeLog
index 58c47c0af..b8b510ede 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2001-11-26  Havoc Pennington  <hp@redhat.com>
+
+	* src/window.c (window_query_root_pointer): add error trap
+
 2001-11-27  Jesus Bravo Alvarez  <jba@pobox.com>
 
 	* configure.in: Added gl (Galician) to ALL_LINGUAS.
diff --git a/src/window.c b/src/window.c
index c7a3b7e90..41b002dcc 100644
--- a/src/window.c
+++ b/src/window.c
@@ -5021,6 +5021,8 @@ window_query_root_pointer (MetaWindow *window,
   int win_x_return, win_y_return;
   unsigned int mask_return;
 
+  meta_error_trap_push (window->display);
+  
   XQueryPointer (window->display->xdisplay,
                  window->xwindow,
                  &root_return,
@@ -5031,6 +5033,8 @@ window_query_root_pointer (MetaWindow *window,
                  &win_y_return,
                  &mask_return);
 
+  meta_error_trap_pop (window->display);
+
   if (x)
     *x = root_x_return;
   if (y)