diff --git a/awesome.c b/awesome.c
index dfc4b4ac6..b31b38ee2 100644
--- a/awesome.c
+++ b/awesome.c
@@ -175,17 +175,8 @@ exit_on_signal(int sig __attribute__ ((unused)))
 static int
 xerror(Display * edpy, XErrorEvent * ee)
 {
-    warn("an XError occured, this may be bad\n");
     if(ee->error_code == BadWindow
-       || (ee->request_code == X_SetInputFocus && ee->error_code == BadMatch)
-       || (ee->request_code == X_PolyText8 && ee->error_code == BadDrawable)
-       || (ee->request_code == X_PolyFillRectangle
-           && ee->error_code == BadDrawable)
-       || (ee->request_code == X_PolySegment && ee->error_code == BadDrawable)
-       || (ee->request_code == X_ConfigureWindow
-           && ee->error_code == BadMatch) || (ee->request_code == X_GrabKey
-                                              && ee->error_code == BadAccess)
-       || (ee->request_code == X_CopyArea && ee->error_code == BadDrawable))
+       || (ee->request_code == X_SetInputFocus && ee->error_code == BadMatch))
         return 0;
     warn("fatal error: request code=%d, error code=%d\n", ee->request_code, ee->error_code);
     return xerrorxlib(edpy, ee);        /* may call exit */