Fixed NPEs.