diff --git a/src/stkutil.c b/src/stkutil.c
index b7fc279f..4f31af45 100644
--- a/src/stkutil.c
+++ b/src/stkutil.c
@@ -5381,8 +5381,10 @@ static bool build_dataobj(struct stk_tlv_builder *tlv,
 		const void *data = va_arg(args, const void *);
 		bool cr = (flags & DATAOBJ_FLAG_CR) ? true : false;
 
-		if (!builder_func(tlv, data, cr))
+		if (!builder_func(tlv, data, cr)) {
+			va_end(args);
 			return false;
+		}
 
 		builder_func = va_arg(args, dataobj_writer);
 	}