ref #8228: fix NPE