diff --git a/src/ex_cmds2.c b/src/ex_cmds2.c
index 76e62f7..5f19592 100644
--- a/src/ex_cmds2.c
+++ b/src/ex_cmds2.c
@@ -1235,7 +1235,7 @@
 	    if (called_emsg)
 	    {
 		++timer->tr_emsg_count;
-		if (!did_throw_save && current_exception != NULL)
+		if (!did_throw_save && did_throw && current_exception != NULL)
 		    discard_current_exception();
 	    }
 	    did_emsg = did_emsg_save;
diff --git a/src/ex_eval.c b/src/ex_eval.c
index 17e0fdb..f209c5f 100644
--- a/src/ex_eval.c
+++ b/src/ex_eval.c
@@ -640,8 +640,11 @@
     void
 discard_current_exception(void)
 {
-    discard_exception(current_exception, FALSE);
-    current_exception = NULL;
+    if (current_exception != NULL)
+    {
+	discard_exception(current_exception, FALSE);
+	current_exception = NULL;
+    }
     did_throw = FALSE;
     need_rethrow = FALSE;
 }
@@ -1978,7 +1981,10 @@
 	 * there is an extra instance for every call of do_cmdline(), anyway.
 	 */
 	if (did_throw || need_rethrow)
+	{
 	    csp->exception = current_exception;
+	    current_exception = NULL;
+	}
 	else
 	{
 	    csp->exception = NULL;
diff --git a/src/version.c b/src/version.c
index 8129a7e..93d26ef 100644
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    705,
+/**/
     704,
 /**/
     703,