Merge "Remove error when trying to get a global buffer that doesn't exist"