fix for null extra callbacks issue

fair point. updated