diff --git a/cfg.c b/cfg.c
index ecb38fc0..2f457e6b 100644
--- a/cfg.c
+++ b/cfg.c
@@ -98,7 +98,7 @@ load_cfg(const char *path, struct cmd_q *cmdq, char **cause)
 	}
 
 	found = 0;
-	while ((buf = fparseln(f, NULL, &line, delim, 0))) {
+	while ((buf = fparseln(f, NULL, &line, delim, 0)) != NULL) {
 		log_debug("%s: %s", path, buf);
 
 		/* Skip empty lines. */
diff --git a/client.c b/client.c
index 55c5aa56..d36be86b 100644
--- a/client.c
+++ b/client.c
@@ -268,6 +268,10 @@ client_main(struct event_base *base, int argc, char **argv, int flags)
 		}
 		return (1);
 	}
+	options_free(&global_options);
+	options_free(&global_s_options);
+	options_free(&global_w_options);
+	environ_free(&global_environ);
 
 	/* Create imsg. */
 	imsg_init(&client_ibuf, fd);