diff --git a/job.c b/job.c
index df515b37..15155bb3 100644
--- a/job.c
+++ b/job.c
@@ -107,7 +107,8 @@ job_add(struct jobs *jobs, struct client *c, const char *cmd,
 
 	job->flags = JOB_DONE;
 
-	RB_INSERT(jobs, jobs, job);
+	if (jobs != NULL)
+		RB_INSERT(jobs, jobs, job);
 	SLIST_INSERT_HEAD(&all_jobs, job, lentry);
 	
 	return (job);
@@ -121,6 +122,9 @@ job_free(struct job *job)
 
 	xfree(job->cmd);
 
+	if (job->freefn != NULL && job->data != NULL)
+		job->freefn(job->data);
+
 	if (job->fd != -1)
 		close(job->fd);
 	if (job->out != NULL)