bugfix: check for null callback data fields