Added NPC check. Fixes #62