diff --git a/src/ChangeLog b/src/ChangeLog
index 6ae6e4fc146..9337dbf6990 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2008-06-07  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* dispnew.c (Flast_nonminibuf_frame): Handle the NULL case.
+
 2008-06-06  Miles Bader  <miles@gnu.org>
 
 	* xdisp.c (x_produce_glyphs): Calculate tab width based on current
diff --git a/src/dispnew.c b/src/dispnew.c
index 0867c2eccbe..f6f464d9eb3 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -7066,9 +7066,10 @@ DEFUN ("last-nonminibuffer-frame", Flast_nonminibuf_frame,
        doc: /* Value is last nonminibuffer frame. */)
      ()
 {
-  Lisp_Object frame;
+  Lisp_Object frame = Qnil;
 
-  XSETFRAME (frame, last_nonminibuf_frame);
+  if (last_nonminibuf_frame)
+    XSETFRAME (frame, last_nonminibuf_frame);
 
   return frame;
 }