diff --git a/src/i830_modes.c b/src/i830_modes.c
index 1a572d16..ac25864c 100644
--- a/src/i830_modes.c
+++ b/src/i830_modes.c
@@ -1,3 +1,4 @@
+/* -*- c-basic-offset: 4 -*- */
 
 #define DEBUG_VERB 2
 /*
@@ -548,6 +549,9 @@ i830AppendModes(ScrnInfoPtr pScrn, DisplayModePtr *modeList,
     DisplayModePtr first = *modeList;
     DisplayModePtr last = i830GetModeListTail(first);
 
+    if (addModes == NULL)
+      return;
+
     if (first == NULL) {
 	*modeList = addModes;
     } else {