diff --git a/ChangeLog b/ChangeLog
index 1026efa63..d81143076 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2000-05-19  Bart Schaefer  <schaefer@zsh.org>
 
+	* 11469: Completion/Commands/_complete_debug,
+	Completion/Core/_main_complete: Locally unset the errexit option
+	and ZERR trap.
+
 	* 11461: Src/builtin.c: Make "read" interruptible even when used
 	in the tail of a pipeline.
 
diff --git a/Completion/Commands/_complete_debug b/Completion/Commands/_complete_debug
index cbbe41e43..7672c75ea 100644
--- a/Completion/Commands/_complete_debug
+++ b/Completion/Commands/_complete_debug
@@ -3,6 +3,8 @@
 setopt localoptions nullglob rcexpandparam extendedglob
 unsetopt markdirs globsubst shwordsplit nounset ksharrays
 
+setopt localtraps noerrexit ; trap - ZERR
+
 (( $+_debug_count )) || integer -g _debug_count
 local tmp=${TMPPREFIX}${$}${words[1]:t}$[++_debug_count]
 local w="${(qq)words}"
diff --git a/Completion/Core/_main_complete b/Completion/Core/_main_complete
index a67e57db6..19295a991 100644
--- a/Completion/Core/_main_complete
+++ b/Completion/Core/_main_complete
@@ -20,6 +20,9 @@ setopt localoptions nullglob rcexpandparam extendedglob
 unsetopt markdirs globsubst shwordsplit nounset ksharrays
 exec </dev/null	# ZLE closes stdin, which can cause errors
 
+# Failed returns from this code are not real errors
+setopt localtraps noerrexit ; trap - ZERR
+
 local func funcs ret=1 tmp _compskip format nm call \
       _completers _completer _completer_num curtag _comp_force_list \
       _matchers _matcher _matcher_num _comp_tags _comp_mesg \