diff -up xorg-server-1.5.99.902/hw/xfree86/common/xf86Xinput.c.orig xorg-server-1.5.99.902/hw/xfree86/common/xf86Xinput.c
--- xorg-server-1.5.99.902/hw/xfree86/common/xf86Xinput.c.orig	2009-02-12 18:48:19.000000000 +0100
+++ xorg-server-1.5.99.902/hw/xfree86/common/xf86Xinput.c	2009-02-12 18:48:36.000000000 +0100
@@ -668,7 +668,7 @@ DeleteInputDeviceRequest(DeviceIntPtr pD
     OsBlockSignals();
     RemoveDevice(pDev);
 
-    if (!isMaster)
+    if (!isMaster && pInfo != NULL)
     {
         if(drv->UnInit)
             drv->UnInit(drv, pInfo, 0);