diff --git a/hw/xfree86/dri2/dri2ext.c b/hw/xfree86/dri2/dri2ext.c
index 094d54d..528de3a 100644
--- a/hw/xfree86/dri2/dri2ext.c
+++ b/hw/xfree86/dri2/dri2ext.c
@@ -366,6 +366,10 @@ DRI2SwapEvent(ClientPtr client, void *data, int type, CARD64 ust, CARD64 msc,
     event.sbc_hi = (CARD64)sbc >> 32;
     event.sbc_lo = sbc & 0xffffffff;
 
+    /* Hackity hackity hack! */
+    if (client->osPrivate == NULL)
+        return;
+
     WriteEventsToClient(client, 1, (xEvent *)&event);
 }