Don't overwrite the buffer argument with NULL.
Actually set the buffer table entry to NULL when set non-buffer arg.