AFAIS the buffer is not used in case of failure, so you could remove it.