diff --git a/src/xterm.c b/src/xterm.c
index 4f77e22ac59..9adb2b2c259 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -7065,6 +7065,7 @@ XTread_socket (sd, expected, hold_quit)
 #endif
 
 #ifndef USE_GTK
+      x_catch_errors (dpyinfo->display);
       while (XPending (dpyinfo->display))
 	{
           int finish;
@@ -7083,6 +7084,7 @@ XTread_socket (sd, expected, hold_quit)
           if (finish == X_EVENT_GOTO_OUT)
             goto out;
         }
+      x_uncatch_errors ();
 #endif /* not USE_GTK */
     }