diff --git a/d/seher/haeuser/moebel/autoloadertruhe.c b/d/seher/haeuser/moebel/autoloadertruhe.c
index e83a241..48e85ea 100644
--- a/d/seher/haeuser/moebel/autoloadertruhe.c
+++ b/d/seher/haeuser/moebel/autoloadertruhe.c
@@ -1014,9 +1014,11 @@
 mixed testfun() {return "bin da\n";}
 
 public int HasAutoloader(string uuid, string loadname) {
-  if (!sizeof(uuid) || !sizeof(loadname) || clonep() || !(uuid in data))
+  if (!sizeof(uuid) || !sizeof(loadname))
     return -1;
+  if (clonep())
+    return -2;
 
-  return (loadname in data[uuid]);
+  return (uuid in data && loadname in data[uuid]);
 }