- fixed NPE (#4937)