Re #1195 fix NPE