Re #1210 fix NPE