added more npid checks