fix NPE in tooling