Fixed to correctly diagnose expressions with NPC