Index: saver.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/Xext/saver.c,v
retrieving revision 1.4
diff -u -r1.4 saver.c
--- saver.c	1 Nov 2004 16:05:27 -0000	1.4
+++ saver.c	5 Nov 2004 01:25:53 -0000
@@ -414,6 +414,10 @@
 {
     ScreenSaverAttrPtr	pOldAttr = (ScreenSaverAttrPtr)value;
     ScreenPtr	pScreen = pOldAttr->screen;
+
+    if (!pScreen)
+        return TRUE;
+
     SetupScreen (pScreen);
 
     if (!pPriv)