notifier is now more defensive