fix for null extra callbacks issue

why not eliminate `|| null`?