diff --git a/dix/gc.c b/dix/gc.c
index 6de1d28b6..3f0711906 100644
--- a/dix/gc.c
+++ b/dix/gc.c
@@ -768,6 +768,8 @@ int
 FreeGC(void *value, XID gid)
 {
     GCPtr pGC = (GCPtr) value;
+    if (!pGC)
+        return BadMatch;
 
     CloseFont(pGC->font, (Font) 0);
     if (pGC->funcs)