Resolve #3614095 "Handle nulls for"

Jonathan Shawrequested to merge
issue/search_api_aais-3614095:3614095-handle-nulls-for into 1.x

Closes #3614095

Merge request reports