Make attribute referencing in notification logic more robust