diff --git a/src/common/gamecode/laws.c b/src/common/gamecode/laws.c
index fd40ed125..1da846350 100644
--- a/src/common/gamecode/laws.c
+++ b/src/common/gamecode/laws.c
@@ -2128,7 +2128,7 @@ display_item(faction *f, unit *u, const item_type * itype)
   key = mkname("iteminfo", name);
   info = locale_getstring(f->locale, key);
 
-  if (info==key || strcmp(info, key)==0) {
+  if (info==NULL || info==key || strcmp(info, key)==0) {
     info = locale_string(f->locale, mkname("iteminfo", "no_info"));
   }
   ADDMSG(&f->msgs, msg_message("displayitem", "weight item description",
@@ -2179,7 +2179,7 @@ display_race(faction *f, unit *u, const race * rc)
 
   key = mkname("raceinfo", rc->_name[0]);
   info = locale_getstring(f->locale, key);
-  if (info==key || strcmp(info, key)==0) {
+  if (info==NULL || info==key || strcmp(info, key)==0) {
     info = locale_string(f->locale, mkname("raceinfo", "no_info"));
   }
 
diff --git a/src/scripts/eressea/xmas2006.lua b/src/scripts/eressea/xmas2006.lua
index 9f9d5195b..2b105790e 100644
--- a/src/scripts/eressea/xmas2006.lua
+++ b/src/scripts/eressea/xmas2006.lua
@@ -16,7 +16,7 @@ function update_xmas2006()
     for r in regions() do
       if r:get_key("xm06") then
         trees = r:get_resource("tree")
-        if trees*0.1>1 then
+        if trees*0.1>=1 then
           r:set_resource("tree", trees * 1.1)
           msg:send_region(r)
         end