Changes in dd140153 broke the notifier when trigger is null