diff --git a/src/terminal.c b/src/terminal.c
index aafd7e8..7d807ac 100644
--- a/src/terminal.c
+++ b/src/terminal.c
@@ -203,6 +203,9 @@
     }
     else
     {
+	free_terminal(term);
+	curbuf->b_term = NULL;
+
 	/* Wiping out the buffer will also close the window and call
 	 * free_terminal(). */
 	do_buffer(DOBUF_WIPE, DOBUF_CURRENT, FORWARD, 0, TRUE);
@@ -235,7 +238,8 @@
 
     if (term->tl_job != NULL)
     {
-	if (term->tl_job->jv_status != JOB_ENDED)
+	if (term->tl_job->jv_status != JOB_ENDED
+				      && term->tl_job->jv_status != JOB_FAILED)
 	    job_stop(term->tl_job, NULL, "kill");
 	job_unref(term->tl_job);
     }
@@ -941,7 +945,9 @@
     setup_job_options(&opt, rows, cols);
     term->tl_job = job_start(argvars, &opt);
 
-    return term->tl_job != NULL ? OK : FAIL;
+    return term->tl_job != NULL
+	&& term->tl_job->jv_channel != NULL
+	&& term->tl_job->jv_status != JOB_FAILED ? OK : FAIL;
 }
 
 /*