--- rxvt-unicode/src/rxvtcolor.C	2004/02/12 01:42:03	1.7
+++ rxvt-unicode/src/rxvtcolor.C	2004/03/14 17:33:08	1.9
@@ -113,6 +113,9 @@
 {
   display = XOpenDisplay (id);
 
+  if (!display)
+    return false;
+
   screen = DefaultScreen (display);
   root   = DefaultRootWindow (display);
   visual = DefaultVisual (display, screen);
@@ -154,7 +157,8 @@
 {
   x_ev.stop ();
 
-  XCloseDisplay (display);
+  if (display)
+    XCloseDisplay (display);
 }
 
 void rxvt_display::im_change_cb ()
@@ -341,7 +345,7 @@
 #if XFT
   XftColorFree (display->display, display->visual, display->cmap, &c);
 #else
-  XFreeColors (display->display, display->cmap, &c, 1, AllPlanes);
+  XFreeColors (display->display, display->cmap, &p, 1, AllPlanes);
 #endif
 }