Fix crash related to bidirectional relationship list items

Change-Id: Ie56762fa95ec7f59f54dc469c32b1af5b50dcbc5