- fixed some NPE