Merge "[search] Fix method call on null value"