diff --git a/src/terminal.c b/src/terminal.c
index 8524560..0c7630c 100644
--- a/src/terminal.c
+++ b/src/terminal.c
@@ -3871,6 +3871,11 @@
     if (buf == NULL)
 	return;
     term = buf->b_term;
+    if (term->tl_vterm == NULL)
+    {
+	EMSG(_("E958: Job already finished"));
+	return;
+    }
 
     if (argvars[2].v_type != VAR_UNKNOWN)
     {
diff --git a/src/version.c b/src/version.c
index a594aa2..67bfbd1 100644
--- a/src/version.c
+++ b/src/version.c
@@ -795,6 +795,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    358,
+/**/
     357,
 /**/
     356,