Replaced non-nullable field check with a built-in cascading filter