Fixed #18026 -- Don't return an anonymous dict if extra_data in storage is empty.