diff --git a/src/caosadvancedtools/crawler.py b/src/caosadvancedtools/crawler.py
index 7b81b81ee9a717c226de7f3f3c0e5f28e3e6e789..41c8871f686fde7bae7d36c29e97619f97f0ce38 100644
--- a/src/caosadvancedtools/crawler.py
+++ b/src/caosadvancedtools/crawler.py
@@ -230,7 +230,7 @@ class Crawler(object):
                 else:
                     update_incomplete = True
             new_cont = tmp
-            if new[0].version:
+            if new_cont[0].version:
                 valids = db.Container()
                 nonvalids = db.Container()
 
diff --git a/src/caosadvancedtools/models/parser.py b/src/caosadvancedtools/models/parser.py
index 658fe5e9a92e5238a63fe025a0b8b6a19e6236ce..c9b890de570d29e4a013b14ebe4579e956277ed2 100644
--- a/src/caosadvancedtools/models/parser.py
+++ b/src/caosadvancedtools/models/parser.py
@@ -260,7 +260,7 @@ class Parser(object):
             for role in ("Property", "RecordType", "Record", "File"):
                 if db.execute_query("COUNT {} {}".format(role, name)) > 0:
                     self.model[name] = db.execute_query(
-                        "FIND ENTITY {} WITH name={}".format(role, name), unique=True)
+                        "FIND {} WITH name={}".format(role, name), unique=True)
                     break
             else:
                 raise Exception("Did not find {}".format(name))