diff --git a/src/intel_driver.c b/src/intel_driver.c
index 1b2c6167..41f03117 100644
--- a/src/intel_driver.c
+++ b/src/intel_driver.c
@@ -505,9 +505,11 @@ static Bool I830PreInit(ScrnInfoPtr scrn, int flags)
 
 	intel->PciInfo = xf86GetPciInfoForEntity(intel->pEnt->index);
 
-	if (!intel_open_drm_master(scrn))
+	if (!intel_open_drm_master(scrn)) {
 		xf86DrvMsg(scrn->scrnIndex, X_ERROR,
 			   "Failed to become DRM master.\n");
+		return FALSE;
+	}
 
 	scrn->monitor = scrn->confScreen->monitor;
 	scrn->progClock = TRUE;