diff -r 51179e0bb250 -r 730d458ec1bf entity.py --- a/entity.py Wed Jun 16 09:21:49 2010 +0200 +++ b/entity.py Wed Jun 16 14:51:17 2010 +0200 @@ -781,7 +781,10 @@ return self._cw_relation_cache(rtype, role, entities, limit) except KeyError: pass - assert self.has_eid() + if not self.has_eid(): + if entities: + return [] + return self.empty_rset() rql = self.cw_related_rql(rtype, role) rset = self._cw.execute(rql, {'x': self.eid}) self.cw_set_relation_cache(rtype, role, rset)