diff --git a/src/avatar_action.cpp b/src/avatar_action.cpp
index 3e55f73daf71c..137abf36e197b 100644
--- a/src/avatar_action.cpp
+++ b/src/avatar_action.cpp
@@ -668,7 +668,12 @@ static float rate_critter( const Creature &c )
 {
     const npc *np = dynamic_cast<const npc *>( &c );
     if( np != nullptr ) {
-        return np->weapon_value( *np->get_wielded_item() );
+        item_location wielded = np->get_wielded_item();
+        if( wielded ) {
+            return np->weapon_value( *wielded );
+        } else {
+            return np->unarmed_value();
+        }
     }
 
     const monster *m = dynamic_cast<const monster *>( &c );