Adds checks to null callbacks