diff --git a/lib/csv.c b/lib/csv.c
index 136d77ae0b..27d0fe4029 100644
--- a/lib/csv.c
+++ b/lib/csv.c
@@ -284,8 +284,11 @@ csv_record_t *csv_encode_record(csv_t *csv, csv_record_t *rec, int count, ...)
 
 	va_start(list, count);
 	str = csv_field_iter(rec, &fld);
-	if (!fld)
+	if (!fld) {
+		va_end(list);
 		return NULL;
+	}
+
 	for (tempc = 0; tempc < count; tempc++) {
 		col = va_arg(list, char *);
 		for (i = 0; i < fld->field_len; i++) {