Check for empty name before searching. Closes #2