--- ./hw/xfree86/os-support/linux/lnx_video.c.org	2008-10-30 10:37:11.835216840 +0100
+++ ./hw/xfree86/os-support/linux/lnx_video.c	2008-10-30 10:37:51.925554253 +0100
@@ -491,9 +491,10 @@
  		(off_t)realBase  + BUS_BASE);
     close(fd);
     if (base == MAP_FAILED) {
-        FatalError("xf86MapVidMem: Could not mmap framebuffer"
+        ErrorF("xf86MapVidMem: Could not mmap framebuffer"
 		   " (0x%08lx,0x%lx) (%s)\n", Base, Size,
 		   strerror(errno));
+	return NULL;
     }
 #ifdef DEBUG
     ErrorF("base: %lx aligned base: %lx\n",base, base + alignOff);