--- deliantra/server/server/apply.C	2007/02/05 01:24:45	1.64
+++ deliantra/server/server/apply.C	2007/02/05 01:31:26	1.65
@@ -3395,15 +3395,21 @@
               (void) insert_ob_in_ob (tmp, who);
             return 1;
           }
+
+        //TODO: this obviously fails for players using a shiorter prefix
+        // i.e. "R" can use Ragnarok's swors.
         if (op->level && (strncmp (op->name, who->name, strlen (who->name))))
           {
             /* if the weapon does not have the name as the character, can't use it. */
             /* (Ragnarok's sword attempted to be used by Foo: won't work) */
             new_draw_info (NDI_UNIQUE, 0, who, "The weapon does not recognize you as its owner.");
-            if (tmp != NULL)
-              (void) insert_ob_in_ob (tmp, who);
+
+            if (tmp)
+              insert_ob_in_ob (tmp, who);
+
             return 1;
           }
+
         SET_FLAG (op, FLAG_APPLIED);
 
         if (skop)