Add check for null FilterNode