Replaced dummy function by just passing NULL and checking for it.