Address crash during global search#1660

jeremypw wants to merge 2 commits intomasterelementary/code:masterfrom

jeremypw/guard-global-search-crashelementary/code:jeremypw/guard-global-search-crashCopy head branch name to clipboard