--- NvCtrlAttributesVidMode.c.orig	2009-11-02 13:36:19.000000000 +0200
+++ NvCtrlAttributesVidMode.c	2009-11-02 13:52:30.000000000 +0200
@@ -210,11 +210,12 @@
     if (vm) free(vm);
 
     /* restore the original error handler, if we overrode it */
-
+#if defined(X_XF86VidModeGetGammaRampSize)
     if (prev_error_handler) {
         XSetErrorHandler(prev_error_handler);
         prev_error_handler = NULL;
     }
+#endif
 
     return NULL;