Remove bug wherein a null in search can crash it