diff --git a/src/caosadvancedtools/cfood.py b/src/caosadvancedtools/cfood.py
index e89216dc263c2a6769327dc6e1746a2eb003d6e7..755f853763b1676f28d43127f6d20484e2546858 100644
--- a/src/caosadvancedtools/cfood.py
+++ b/src/caosadvancedtools/cfood.py
@@ -147,12 +147,16 @@ class AbstractCFood(object):
 
     @staticmethod
     def find_existing(entity):
-        query_string = "FIND Record " + entity.get_parents()[0].name
-        #import IPython
-        # IPython.embed()
-        query_string += " with " + " and ".join(
-            ["'" + p.name + "'='"
-             + get_value(p) + "'" for p in entity.get_properties()])
+        if entity.name is None:
+            query_string = "FIND Record " + entity.get_parents()[0].name
+            #import IPython
+            # IPython.embed()
+            query_string += " with " + " and ".join(
+                ["'" + p.name + "'='"
+                 + get_value(p) + "'" for p in entity.get_properties()])
+        else:
+            query_string = "FIND '{}'".format(entity.name)
+
         print(query_string)
         q = db.Query(query_string)
         try:
diff --git a/src/caosadvancedtools/utils.py b/src/caosadvancedtools/utils.py
index 2d3e5c780a8af2ad33507a8a4c152b02d0e1e0ec..4fd569a1e928d916b863ff2ba4f66a6b7c2d3aa6 100644
--- a/src/caosadvancedtools/utils.py
+++ b/src/caosadvancedtools/utils.py
@@ -35,7 +35,10 @@ def replace_path_prefix(path, old_prefix, new_prefix):
     """
 
     if not path.startswith(old_prefix):
-        raise RuntimeError("Path does not start with old_prefix")
+        raise RuntimeError(
+            "Path does not start with old_prefix\n{}\nvs\n{}".format(
+                path,
+                old_prefix))
     path = path[len(old_prefix):]
 
     return os.path.join(new_prefix, path)