--- programs/Xserver/hw/xfree86/common/xf86Init.c.old	2004-08-20 14:22:39 +0900
+++ programs/Xserver/hw/xfree86/common/xf86Init.c	2005-01-03 16:25:29 +0900
@@ -1244,7 +1244,7 @@
   /*
    * try to deinitialize all input devices
    */
-  if (xf86Info.pKeyboard)
+  if (xf86Info.pKeyboard && xf86Info.kbdProc)
     (xf86Info.kbdProc)(xf86Info.pKeyboard, DEVICE_CLOSE);
 
   /*