diff --git a/std/living/put_and_get.c b/std/living/put_and_get.c
index 711aca4..d290f31 100644
--- a/std/living/put_and_get.c
+++ b/std/living/put_and_get.c
@@ -198,7 +198,7 @@
             if (o && stringp(str) && sizeof(str))
                 return str;
 
-            if (environment() &&
+            if (environment(o) &&
                 stringp(str = environment(o)->QueryProp(P_NOLEAVE_MSG)))
                 return capitalize(
                     replace_personal(str, ({o, environment(o)}), 1));
@@ -224,7 +224,7 @@
             return capitalize(wen0 + " kannst Du dort nicht hineinstecken.");
 
         case ME_CANT_LEAVE_ENV:
-            if (environment() &&
+            if (environment(o) &&
                 stringp(str = environment(o)->QueryProp(P_NOLEAVE_MSG)))
                 return capitalize(
                     replace_personal(str, ({o, environment(o)}), 1));