Improved the Raven handler when using a Buffer handler