diff --git a/src/extcheck.c b/src/extcheck.c
index 9ef87c5..4634731 100644
--- a/src/extcheck.c
+++ b/src/extcheck.c
@@ -358,15 +358,13 @@
 	if (check->envp) {
 		for (i = 0; i < EXTCHK_SIZE; i++)
 			free(check->envp[i]);
-		free(check->envp);
-		check->envp = NULL;
+		ha_free(&check->envp);
 	}
 
 	if (check->argv) {
 		for (i = 1; i < 5; i++)
 			free(check->argv[i]);
-		free(check->argv);
-		check->argv = NULL;
+		ha_free(&check->argv);
 	}
 	return 0;
 }