Avoid some NPEs when no results returned