NPE fixes
NPE fix
don't need local