Merge "unregistered null callback will cause a crash later"