Merge "Check for null callback" into tm-dev