Don't leave junk buffers lying around.
Better error reporting.