FIXES: #300 null check in autocomplete