npe fix
initial of #132