diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index 666a424..bf81251 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -295,7 +295,15 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv)
 	xf86Msg(X_ERROR, "Error parsing the config file\n");
 	return;
       case CONFIG_NOFILE:
-	autoconfig = TRUE;
+	if (xf86ConfigFile) {
+	  xf86Msg(X_ERROR, "Command-line given config file \"%s\" not found\n",
+		  xf86ConfigFile);
+	  return;
+	} else {
+	  xf86MsgVerb(X_DEFAULT, 0,
+		      "Default config file missing, switching to auto-configuration\n");
+	  autoconfig = TRUE;
+	}
 	break;
       }
     }