Fixed regression; wasn't checking for null callback.