Added null check to update notifier