Merge commit '8440ecce813112493d2af4097608735c4c7a870c'

* commit '8440ecce813112493d2af4097608735c4c7a870c':
  Check if a searchable is null before adding it to the list of searchables