2 files changed, 3 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 65cd4fa62b6..d0130c73474 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2009-06-27  Chong Yidong  <cyd@stupidchicken.com>
 
+        * frame.c (x_get_arg): Check if dpyinfo is non-NULL.
+
         * xdisp.c (mouse_face_from_buffer_pos): Fix detection of
         truncation glyphs (Bug#3686).
 
diff --git a/src/frame.c b/src/frame.c
index 10713826b50..9e05b1b8456 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -4009,7 +4009,7 @@ x_get_arg (dpyinfo, alist, param, attribute, class, type)
      look in the X resources.  */
   if (EQ (tem, Qnil))
     {
-      if (attribute)
+      if (attribute && dpyinfo)
         {
           tem = display_x_get_resource (dpyinfo,
                                         build_string (attribute),