diff --git a/secure/scoremaster.c b/secure/scoremaster.c
index 0cd1e5d..83dc466 100644
--- a/secure/scoremaster.c
+++ b/secure/scoremaster.c
@@ -651,7 +651,10 @@
 
   if (stringp(oldkey)) {
     oldkey = load_name(oldkey); 
-    num=npcs[oldkey,NPC_NUMBER];
+    if (member(npcs, oldkey))
+      num=npcs[oldkey,NPC_NUMBER];
+    else
+      return SCORE_INVALID_ARG;
   }
   else if (intp(oldkey)) num=oldkey;
   else return SCORE_INVALID_ARG;