Fixed NPC exception