fix for null extra callbacks issue

both `undefined` and `null` evaluate to false, so should act the same in this case. Less code === more maintainable :-)