fix remaining getstrtoken uses without null-check.