diff --git a/hw/xfree86/common/xf86Helper.c b/hw/xfree86/common/xf86Helper.c
index cb4a60f87..cbebd5461 100644
--- a/hw/xfree86/common/xf86Helper.c
+++ b/hw/xfree86/common/xf86Helper.c
@@ -1304,7 +1304,8 @@ xf86MatchDevice(const char *drivername, GDevPtr ** sectlist)
      */
     for (j = 0; xf86ConfigLayout.screens[j].screen != NULL; j++) {
         screensecptr = xf86ConfigLayout.screens[j].screen;
-        if ((screensecptr->device->driver != NULL)
+        if ((screensecptr->device != NULL)
+            && (screensecptr->device->driver != NULL)
             && (xf86NameCmp(screensecptr->device->driver, drivername) == 0)
             && (!screensecptr->device->claimed)) {
             /*