diff --git a/hw/xfree86/i2c/xf86i2c.c b/hw/xfree86/i2c/xf86i2c.c
--- a/hw/xfree86/i2c/xf86i2c.c
+++ b/hw/xfree86/i2c/xf86i2c.c
@@ -615,19 +615,21 @@
 xf86DestroyI2CDevRec(I2CDevPtr d, Bool unalloc)
 {
     if (d) {
-        I2CDevPtr *p;
+        if (d->pI2CBus) {
+            I2CDevPtr *p;
 
-        /* Remove this from the list of active I2C devices. */
+            /* Remove this from the list of active I2C devices. */
 
-        for (p = &d->pI2CBus->FirstDev; *p != NULL; p = &(*p)->NextDev)
-            if (*p == d) {
-                *p = (*p)->NextDev;
-                break;
-            }
+            for (p = &d->pI2CBus->FirstDev; *p != NULL; p = &(*p)->NextDev)
+                if (*p == d) {
+                    *p = (*p)->NextDev;
+                    break;
+                }
 
-        xf86DrvMsg(d->pI2CBus->scrnIndex, X_INFO,
-                   "I2C device \"%s:%s\" removed.\n",
-                   d->pI2CBus->BusName, d->DevName);
+            xf86DrvMsg(d->pI2CBus->scrnIndex, X_INFO,
+                       "I2C device \"%s:%s\" removed.\n",
+                       d->pI2CBus->BusName, d->DevName);
+        }
 
         if (unalloc)
             free(d);