Add missing null check when retrieving extras (cherry picked from commit 425bd2b01b) Signed-off-by: Joshua M. Boniface <joshua@boniface.me>
425bd2b01b