diff --git a/src/terminal.c b/src/terminal.c
index 5fbfc2e..d1ed569 100644
--- a/src/terminal.c
+++ b/src/terminal.c
@@ -1084,13 +1084,19 @@
     if (channel != NULL)
 	channel_clear(channel);
     if (job != NULL)
+    {
+	job->jv_channel = NULL;
 	job_cleanup(job);
+    }
+    term->tl_job = NULL;
     if (jo != NULL)
 	CloseHandle(jo);
     if (term->tl_winpty != NULL)
 	winpty_free(term->tl_winpty);
+    term->tl_winpty = NULL;
     if (term->tl_winpty_config != NULL)
 	winpty_config_free(term->tl_winpty_config);
+    term->tl_winpty_config = NULL;
     if (winpty_err != NULL)
     {
 	char_u *msg = utf16_to_enc(
@@ -1108,9 +1114,12 @@
     static void
 term_free(term_T *term)
 {
-    winpty_free(term->tl_winpty);
-    winpty_config_free(term->tl_winpty_config);
-    vterm_free(term->tl_vterm);
+    if (term->tl_winpty != NULL)
+	winpty_free(term->tl_winpty);
+    if (term->tl_winpty_config != NULL)
+	winpty_config_free(term->tl_winpty_config);
+    if (term->tl_vterm != NULL)
+	vterm_free(term->tl_vterm);
 }
 
 # else
@@ -1149,7 +1158,8 @@
     static void
 term_free(term_T *term)
 {
-    vterm_free(term->tl_vterm);
+    if (term->tl_vterm != NULL)
+	vterm_free(term->tl_vterm);
 }
 # endif
 
diff --git a/src/version.c b/src/version.c
index ad2a45d..bfeedcd 100644
--- a/src/version.c
+++ b/src/version.c
@@ -770,6 +770,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    758,
+/**/
     757,
 /**/
     756,