Merge branch 'master' of ssh://mgg/mudlib-public
diff --git a/room/death/death_room.c b/room/death/death_room.c
index c37dcbe..cb20aca 100644
--- a/room/death/death_room.c
+++ b/room/death/death_room.c
@@ -512,7 +512,7 @@
                 " ...";
         }
         else if ( !killer_name ) {
-                if ( ({string}) pl->QueryProp(P_KILLER) == "gift" ){
+                if ( ({object|string}) pl->QueryProp(P_KILLER) == "gift" ){
                     killer_name = "Vergiftung";
                     kgen = FEMALE;
                     kart = 1;