Re #1211 fix NPE