added conditional guards around neocomplete