diff --git a/secure/PlayerDeleter.c b/secure/PlayerDeleter.c
index 1b1ce2e..afb3cce 100644
--- a/secure/PlayerDeleter.c
+++ b/secure/PlayerDeleter.c
@@ -73,7 +73,7 @@
   }
 
   // Files loeschen
-  if (file_size("/"SECUREDIR"/save"+part_filename) > FSIZE_NOFILE)
+  if (file_size(LIBDATADIR"/"SECUREDIR"/save"+part_filename) > FSIZE_NOFILE)
     rm("/"SECUREDIR"/save"+part_filename);
   if (file_size("/"LIBSAVEDIR + part_filename) > FSIZE_NOFILE)
     rm("/"LIBSAVEDIR + part_filename);
diff --git a/secure/merlin.c b/secure/merlin.c
index 2710b23..5478d8c 100644
--- a/secure/merlin.c
+++ b/secure/merlin.c
@@ -573,9 +573,7 @@
     if (sscanf(str,"%s sagt: %s",name,message)!=2)
       return;
 
-  if (!name || name=="" ||            
-      catch(s=file_size("save/"+name[0..0]+"/"+name+".o");publish)            
-      || s<=0 )
+  if (!name || !sizeof(name) || !master()->find_userinfo(name))
     return;
 
   if (name!=getuid(this_interactive()) && !ARCH_SECURITY)