--- xc/programs/Xserver/hw/xfree86/common/xf86Init.c.orig	Fri Aug 20 05:22:39 2004
+++ xc/programs/Xserver/hw/xfree86/common/xf86Init.c	Thu Dec  9 13:24:44 2004
@@ -1244,7 +1244,7 @@
   /*
    * try to deinitialize all input devices
    */
-  if (xf86Info.pKeyboard)
+  if (xf86Info.kbdProc && xf86Info.pKeyboard)
     (xf86Info.kbdProc)(xf86Info.pKeyboard, DEVICE_CLOSE);
 
   /*