- fixed potential NPE