diff --git a/src/main.c b/src/main.c
index 8f3856f7e2..72d0211432 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1246,6 +1246,13 @@ main_loop(
 	else
 	    previous_got_int = FALSE;
 
+#ifdef FEAT_EVAL
+	// At the toplevel there is no exception handling.  Discard any that
+	// may be hanging around (e.g. from "interrupt" at the debug prompt).
+	if (did_throw && !ex_normal_busy)
+	    discard_current_exception();
+#endif
+
 	if (!exmode_active)
 	    msg_scroll = FALSE;
 	quit_more = FALSE;
diff --git a/src/version.c b/src/version.c
index 7a75be32aa..879a0e8b47 100644
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    4098,
 /**/
     4097,
 /**/