fix for null extra callbacks issue

i can if you think that's better.