- fixed possible NPEs