Tweaking handling of empty callbacks to give the user a hint