No to Wolverine wannabe NPC's

Fixes Issue #1644