Lang npe

I think this need to be also merged in 2.0