diff --git a/ChangeLog b/ChangeLog
index e7bb080e5..2a467178f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-02-27  Peter Stephenson  <pws@csr.com>
+
+	* 18313: Src/Zle/zle_misc.c: After a single yank (hence
+	no kill ring), yank-pop	did unpleasant things with a NULL pointer.
+
 2003-02-27  Oliver Kiddle  <opk@zsh.org>
 
 	* unposted: Completion/Unix/Command/_tar: correct my typo
diff --git a/Src/Zle/zle_misc.c b/Src/Zle/zle_misc.c
index d63b52caa..4a5c6c5c2 100644
--- a/Src/Zle/zle_misc.c
+++ b/Src/Zle/zle_misc.c
@@ -372,7 +372,7 @@ yankpop(char **args)
     int cc, kctstart = kct;
     Cutbuffer buf;
 
-    if (!(lastcmd & ZLE_YANK))
+    if (!(lastcmd & ZLE_YANK) || !kring)
 	return 1;
     do {
 	/*