#4018 fix NPE