2 files changed, 8 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 99a3e7e7299..eb05786e3fa 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2014-01-21  Eli Zaretskii  <eliz@gnu.org>
+
+        * w32fns.c (unwind_create_frame): Avoid crashing inside assertion
+        when the image cache is not yet allocated.  (Bug#16509)
+
 2014-01-21  Dmitry Antipov  <dmantipov@yandex.ru>
 
         * buffer.c (Fkill_buffer): When killing an indirect buffer,
diff --git a/src/w32fns.c b/src/w32fns.c
index d6f3fe7a3eb..0d965647599 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -4250,7 +4250,9 @@ unwind_create_frame (Lisp_Object frame)
 #ifdef GLYPH_DEBUG
       /* Check that reference counts are indeed correct.  */
       eassert (dpyinfo->reference_count == dpyinfo_refcount);
-      eassert (dpyinfo->terminal->image_cache->refcount == image_cache_refcount);
+      eassert ((dpyinfo->terminal->image_cache == NULL
+                && image_cache_refcount == 0)
+               || dpyinfo->terminal->image_cache->refcount == image_cache_refcount);
 #endif
       return Qt;
     }