Proper handling of the lack of current buffer