added null checking for callbacks
version update